修改

src/main/java/com/steerinfo/dil/service/impl/TmsWeightResultServiceImpl.java

@@ -208,7 +208,11 @@ public class TmsWeightResultServiceImpl {
                             item.setNetWeight(BigDecimal.ZERO);
                         }
                         tmsWeightResultMapper.updateByPrimaryKeySelective(item);
-                        omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getTareSegmentSqe(),"出厂",item.getUpdateUsername(),item.getPoundNo());
+                        if(item.getNetWeightTime() != null) {
+                            omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getTareSegmentSqe(),"出厂",item.getUpdateUsername(),item.getPoundNo());
+                        }else{
+                            omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getTareSegmentSqe(),"计皮",item.getUpdateUsername(),item.getPoundNo());
+                        }
                         omsOrderChildService.updateOrderChildInfo(transOrderIds.get(0),item.getTransOrderChildId(),item.getTareWeightTime(),"计皮");
                         omsOrderChildService.updateOrderChildInfo(transOrderIds.get(0),item.getTransOrderChildId(),item.getNetWeightTime(),"净重");
                         OmsOrderChild omsOrderChild = omsOrderChildMapper.selectByPrimaryKey(transOrderChildId);
@@ -328,7 +332,11 @@ public class TmsWeightResultServiceImpl {
                             item.setNetWeight(BigDecimal.ZERO);
                         }
                         tmsWeightResultMapper.updateByPrimaryKeySelective(item);
-                        omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getGrossSegmentSqe(),"出厂",item.getUpdateUsername(),item.getPoundNo());
+                        if(item.getNetWeightTime() != null) {
+                            omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getTareSegmentSqe(),"出厂",item.getUpdateUsername(),item.getPoundNo());
+                        }else{
+                            omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getTareSegmentSqe(),"计毛",item.getUpdateUsername(),item.getPoundNo());
+                        }
                         omsOrderChildService.updateOrderChildInfo(transOrderIds.get(0),item.getTransOrderChildId(),item.getGrossWeightTime(),"计毛");
                         omsOrderChildService.updateOrderChildInfo(transOrderIds.get(0),item.getTransOrderChildId(),item.getNetWeightTime(),"净重");
                         OmsOrderChild omsOrderChild = omsOrderChildMapper.selectByPrimaryKey(transOrderChildId);
@@ -410,7 +418,11 @@ public class TmsWeightResultServiceImpl {
                         omsOrderChildMapper.updateByPrimaryKeySelective(omsOrderChild);
                         map.put("resultId",item.getResultId());//返回给日志记录
                         try{
-                            omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getTareSegmentSqe(),"出厂",item.getUpdateUsername(),item.getPoundNo());
+                            if(item.getNetWeightTime() != null) {
+                                omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getTareSegmentSqe(),"出厂",item.getUpdateUsername(),item.getPoundNo());
+                            }else{
+                                omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getTareSegmentSqe(),"计皮",item.getUpdateUsername(),item.getPoundNo());
+                            }
                             omsOrderChildService.updateOrderChildInfo(transOrderIds.get(0),item.getTransOrderChildId(),item.getTareWeightTime(),"计皮");
                             omsOrderChildService.updateOrderChildInfo(transOrderIds.get(0),item.getTransOrderChildId(),item.getNetWeightTime(),"净重");
                         }catch (Exception e){}
@@ -493,7 +505,11 @@ public class TmsWeightResultServiceImpl {
                         omsOrderChildMapper.updateByPrimaryKeySelective(omsOrderChild);
                         map.put("resultId",item.getResultId());//返回给日志记录
                         try{
-                            omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getGrossSegmentSqe(),"出厂",item.getUpdateUsername(),item.getPoundNo());
+                            if(item.getNetWeightTime() != null) {
+                                omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getTareSegmentSqe(),"出厂",item.getUpdateUsername(),item.getPoundNo());
+                            }else{
+                                omsTransOrderService.updateOrderStatus(transOrderIds.get(0),item.getTareSegmentSqe(),"计毛",item.getUpdateUsername(),item.getPoundNo());
+                            }
                             omsOrderChildService.updateOrderChildInfo(transOrderIds.get(0),item.getTransOrderChildId(),item.getGrossWeightTime(),"计毛");
                             omsOrderChildService.updateOrderChildInfo(transOrderIds.get(0),item.getTransOrderChildId(),item.getNetWeightTime(),"净重");
                         }catch (Exception e){}