预托书、托书编辑回写

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -282,7 +282,11 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 
 			}
 
-			SyLetterDeposit entity = syLetterDepositService.syLetterDepositEdit(syLetterDeposit);
+			//查询之前的数据
+			SyLetterDeposit t = syLetterDepositService.getById(syLetterDeposit.getId());
+			t.setSyLetterDepositItemList(list);
+
+			SyLetterDeposit entity = syLetterDepositService.syLetterDepositEdit(t,syLetterDeposit);
             result.setMessage("编辑成功！");
             result.setSuccess(true);
             result.setResult(entity);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/service/ISyLetterDepositService.java

@@ -31,7 +31,7 @@ public interface ISyLetterDepositService extends IService<SyLetterDeposit> {
     public SyLetterDeposit syLetterDepositAdd(SyLetterDeposit syLetterDeposit);
 
     //预托书修改
-    public SyLetterDeposit syLetterDepositEdit(SyLetterDeposit syLetterDeposit);
+    public SyLetterDeposit syLetterDepositEdit(SyLetterDeposit syLetterDeposit,SyLetterDeposit syLetterDepositEdit);
 
     //预托书提交、取消提交
     public int syLetterDepositSubmit(String id,String type);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/service/impl/SyLetterDepositServiceImpl.java

@@ -249,7 +249,7 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
      * @return
      */
     @Override
-    public SyLetterDeposit syLetterDepositEdit(SyLetterDeposit syLetterDeposit) {
+    public SyLetterDeposit syLetterDepositEdit(SyLetterDeposit syLetterDeposit,SyLetterDeposit syLetterDepositEdit) {
 
         //删除子表
         String id = syLetterDeposit.getId();
@@ -276,7 +276,7 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
 
             }
             //新增
-            syLetterDepositAdd(syLetterDeposit);
+            syLetterDepositAdd(syLetterDepositEdit);
         }
         return syLetterDeposit;
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -229,8 +229,15 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 //			result.setMessage("单据已提交，不允许修改！");
 //			return result;
 //		}
-
-		syShippingOrderService.syShippingOrderEdit(syShippingOrder);
+		 //查询编辑之前的数据
+		 SyShippingOrder entity = syShippingOrderService.getById(syShippingOrder.getId());
+		 QueryWrapper<SyShippingOrderItem> queryWrapper = new QueryWrapper<>();
+		 queryWrapper.eq("sy_shipping_order_item_id",syShippingOrder.getId());
+		 queryWrapper.eq("del_flag",0);
+		 List<SyShippingOrderItem> list = syShippingOrderItemService.list(queryWrapper);
+		 entity.setSyShippingOrderItemList(list);
+
+		syShippingOrderService.syShippingOrderEdit(entity,syShippingOrder);
 
 		return Result.OK("编辑成功!");
 	}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/ISyShippingOrderService.java

@@ -32,7 +32,7 @@ public interface ISyShippingOrderService extends IService<SyShippingOrder> {
     public SyShippingOrder syShippingOrderAdd(SyShippingOrder syShippingOrder) throws ParseException;
 
     //修改
-    public SyShippingOrder syShippingOrderEdit(SyShippingOrder syShippingOrder) throws ParseException;
+    public SyShippingOrder syShippingOrderEdit(SyShippingOrder syShippingOrder,SyShippingOrder syShippingOrderEdit) throws ParseException;
 
     //提交/取消提交
     public int syShippingOrderSubmit(List<String> id, String type);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -213,7 +213,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setRSupplier(itemli.getSupplierDyeingPlant());//染厂供应商
                         syShippingOrderItem.setRSupplierCode(itemli.getSupplierCodeDyeingPlant());//染厂供应商编码
                         syShippingOrderItem.setMasterMetering(itemli.getMasterMetering());//单位
-                        syShippingOrderItem.setGarmentFactory(li.getGarmentFactory());
+                        syShippingOrderItem.setGarmentFactory(itemli.getGarmentFactory());
                         syShippingOrderItem.setEnglishName(li.getEnglishProductName());//英文名称
                         syShippingOrderItem.setPkOrg(itemli.getAccount());
 
@@ -282,7 +282,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setSupplierCode(null);
                         syShippingOrderItem.setRSupplier(null);//染厂供应商
                         syShippingOrderItem.setRSupplierCode(null);//染厂供应商编码
-                        syShippingOrderItem.setGarmentFactory(li.getGarmentFactory());//成衣工厂
+                        syShippingOrderItem.setGarmentFactory(lit.getGarmentFactory());//成衣工厂
                         syShippingOrderItem.setEnglishName(li.getEnglishProductName());//英文名称
                         syShippingOrderItem.setDeclarationUnitPrice(lit.getCustomsDeclarationUnitPrice());//报关单价
                         syShippingOrderItem.setPkOrg(lit.getAcSetNo());
@@ -354,7 +354,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
      * @return
      */
     @Override
-    public SyShippingOrder syShippingOrderEdit(SyShippingOrder syShippingOrder) throws ParseException {
+    public SyShippingOrder syShippingOrderEdit(SyShippingOrder syShippingOrder,SyShippingOrder syShippingOrderEdit) throws ParseException {
 
         //删除美元信息
         syLetterDepositMapper.syUsdDelete(syShippingOrder.getId());
@@ -402,7 +402,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         updateById(syShippingOrder);
 
         //新增主表
-         syShippingOrderAdd(syShippingOrder);
+         syShippingOrderAdd(syShippingOrderEdit);
          return syShippingOrder;
 
     }