出入库流程优化-入库详单优化

jiazx0107@163.com

2023-06-24 6f45f4a29ce38525f3f9e3931bcedfc77bde765e

 igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java

@@ -19,7 +19,6 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.service.HInoutSettleService;
import com.ld.igds.models.InoutSettle;

@@ -137,22 +136,22 @@
   private InoutSettle getNewSettle(InoutData data) {
      InoutSettle inoutSettle = new InoutSettle();
      inoutSettle.setId(data.getId());
      inoutSettle.setType(data.getType());
      inoutSettle.setCustomerId(data.getCustomerId());
      inoutSettle.setCustomerName(data.getCustomerName());
      inoutSettle.setFullWeight(data.getFullWeight());
      inoutSettle.setEmptyWeight(data.getEmptyWeight());
      inoutSettle.setNetWeight(data.getNetWeight());
   //   inoutSettle.setType(data.getType());
   //   inoutSettle.setCustomerId(data.getCustomerId());
   //   inoutSettle.setCustomerName(data.getCustomerName());
   //   inoutSettle.setFullWeight(data.getFullWeight());
   //   inoutSettle.setEmptyWeight(data.getEmptyWeight());
   //   inoutSettle.setNetWeight(data.getNetWeight());
      inoutSettle.setSettleWeight(data.getSettleWeight());
      inoutSettle.setDeSum(data.getDeSum());
   //   inoutSettle.setDeSum(data.getDeSum());

      inoutSettle.setCompleteTime(data.getCompleteTime());
   //   inoutSettle.setCompleteTime(data.getCompleteTime());
      inoutSettle.setDepotId(data.getDepotId());
      inoutSettle.setDeptId(data.getDeptId());
      inoutSettle.setUserName(data.getUserName());
      inoutSettle.setPlateNum(data.getPlateNum());
      inoutSettle.setFoodLevel(data.getFoodLevel());
      inoutSettle.setFoodVariety(data.getFoodVariety());
   //   inoutSettle.setUserName(data.getUserName());
   //   inoutSettle.setPlateNum(data.getPlateNum());
   //   inoutSettle.setFoodLevel(data.getFoodLevel());
   //   inoutSettle.setFoodVariety(data.getFoodVariety());

      if (data.getPrice() != null) {
         inoutSettle.setPayPrice(data.getPrice());
@@ -167,9 +166,9 @@
   @Expose
   @Transactional
   public String saveData(InoutSettle data) {
      if (null == data.getType()) {
         data.setType(InoutConstant.TYPE_IN);
      }
//      if (null == data.getType()) {
//         data.setType(InoutConstant.TYPE_IN);
//      }

      hSettleService.saveOrUpdateData(data);