|
@@ -265,7 +265,8 @@ public class EmsProdplanYearController extends BaseRESTfulController {
|
|
|
if(monList.size()<=0){
|
|
|
EmsProdplanMonth emsProdplanMonth = emsProdplanMonthService.add(monModel);
|
|
|
} else {
|
|
|
- if((model.getParentid().equals("LG") && monModel.getProductid().equals("方坯")) || model.getParentid().equals("JJZ") || model.getParentid().equals("FDC")) {
|
|
|
+ if((model.getParentid().equals("LG") && monModel.getProductid().equals("方坯")) || model.getParentid().equals("JJZ")) {
|
|
|
+ //|| model.getParentid().equals("FDC")
|
|
|
monModel.setKxf_weight(monList.get(0).getKxf_weight().add(monModel.getKxf_weight()));
|
|
|
monModel.setWeightMonth(monList.get(0).getWeightMonth().add(monModel.getWeightMonth()));
|
|
|
monModel.setWeightDay(monList.get(0).getWeightDay().add(monModel.getWeightDay()));
|
|
@@ -502,7 +503,8 @@ public class EmsProdplanYearController extends BaseRESTfulController {
|
|
|
if(monList.size()<=0){
|
|
|
emsProdplanMonthService.add(monModel);
|
|
|
} else {
|
|
|
- if((model.getParentid().equals("LG")&&monModel.getProductid().equals("方坯")) || model.getParentid().equals("JJZ") || model.getParentid().equals("FDC")) {
|
|
|
+ if((model.getParentid().equals("LG")&&monModel.getProductid().equals("方坯")) || model.getParentid().equals("JJZ")) {
|
|
|
+ //|| model.getParentid().equals("FDC")
|
|
|
if (i == 0){
|
|
|
monList.get(0).setWeightMonth(BigDecimal.valueOf(0));
|
|
|
monList.get(0).setWeightDay(BigDecimal.valueOf(0));
|