材料出库接口/预托书/发运明细

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

@@ -3,9 +3,7 @@ package org.jeecg.modules.documents.letterDeposit.controller;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -23,13 +21,13 @@ import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
 import org.jeecg.modules.documents.letterDeposit.entity.VO.SyPreAssembledPackingListVo;
 import org.jeecg.modules.documents.letterDeposit.service.ISyLetterDepositItemService;
 import org.jeecg.modules.documents.letterDeposit.service.ISyLetterDepositService;
-import java.util.Date;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetails;
+import org.jeecg.modules.documents.shippingDetails.entity.VO.OrderDataVo;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -382,4 +380,32 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 		 }
 		 return result;
 	 }
+
+
+	 @ApiOperation(value="预装箱单数据合并", notes="预装箱单数据合并")
+	 @GetMapping(value = "/mergeSyPreAssembledPackingList")
+	 public Result<List<SyPreAssembledPackingListVo>> mergeSyPreAssembledPackingList(String itemId){
+
+		 Result<List<SyPreAssembledPackingListVo>> result = new Result<>();
+		 List<String> stringList = new ArrayList<>();
+		 QueryWrapper<SyPreAssembledPackingListVo> queryWrapper = new QueryWrapper<>();
+
+		 Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(1, -1);
+
+		 String itemIdSplit[] = itemId.split(",");
+		 for (String li:itemIdSplit){
+			 stringList.add(li);
+		 }
+		 queryWrapper.in("b.id",stringList).eq("a.del_flag",0);
+		 queryWrapper.groupBy("a.item_number,a.memo,a.pre_delivery_date,a.order_type,a.depositary_receipt_no,b.inventory_name,b.po_no,b.distribution_point," +
+				 "b.colour,b.pur_or_sub_order");
+
+		 IPage<SyPreAssembledPackingListVo> pageList = syLetterDepositService.mergeSyPreAssembledPackingList(page, queryWrapper);
+
+		 result.setSuccess(true);
+		 result.setMessage("查询成功！");
+		 result.setResult(pageList.getRecords());
+
+		 return result;
+	 }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/entity/SyLetterDeposit.java

@@ -56,11 +56,11 @@ public class SyLetterDeposit {
 	@Excel(name = "经营单位地址", width = 15)
     @ApiModelProperty(value = "经营单位地址")
 	private java.lang.String unitInOperationAddress;
-	/**装运期限*/
-	@Excel(name = "装运期限", width = 20, format = "yyyy-MM-dd")
+	/**装柜日期*/
+	@Excel(name = "装柜日期", width = 20, format = "yyyy-MM-dd")
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "装运期限")
+    @ApiModelProperty(value = "装柜日期")
 	private java.util.Date latestDateOfShipment;
 	/**最终船期*/
 	@Excel(name = "最终船期", width = 20, format = "yyyy-MM-dd")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/SyLetterDepositMapper.java

@@ -34,4 +34,8 @@ public interface SyLetterDepositMapper extends BaseMapper<SyLetterDeposit> {
     public void syRmbDelete(@Param("syLetterDepositId") String syLetterDepositId);
     //删除美元
     public void syUsdDelete(@Param("syLetterDepositId") String syLetterDepositId);
+
+    //合并预装箱单数据
+    IPage<SyPreAssembledPackingListVo> mergeSyPreAssembledPackingList(IPage<SyPreAssembledPackingListVo> page, @Param("ew") QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -6,8 +6,8 @@
     <select id="querySyPreAssembledPackingList" resultType="org.jeecg.modules.documents.letterDeposit.entity.VO.SyPreAssembledPackingListVo">
 
 select a.id as id,b.id as itemId,a.item_number as itemNumber,a.pre_delivery_date as preDeliveryDate ,b.inventory_name as inventoryName,b.po_no as poNo,b.distribution_point as distributionPoint,
-a.memo,a.customer,b.colour,b.box_number as  boxNumber,a.container_code as containerCode,b.pur_or_sub_order as spurOrSubOrder,
-a.container_number as containerNumber,a.total_net_weight as totalNetWeight,a.order_type as orderType,sum(b.total_quantity) as totalQuantity
+a.memo,a.customer,b.colour,b.box_number as  boxNumber,b.pur_or_sub_order as spurOrSubOrder,
+a.total_net_weight as totalNetWeight,a.order_type as orderType,b.total_quantity as totalQuantity
 a.total_gross_weight as totalGrossWeight,a.total_volume as totalVolume,a.total_price as totalPrice,b.factory_unit_price as factoryUnitPrice,
 a.depositary_receipt_no as depositaryReceiptNo from sy_pre_assembled_packing_list a
 left join sy_pre_assembled_packing_list_item b
@@ -60,4 +60,18 @@ on a.id = b.sy_pre_assembled_packing_list_id and b.del_flag = 0
         where sy_letter_deposit_id = #{syLetterDepositId}
 
     </update>
+
+
+    <select id="mergeSyPreAssembledPackingList" resultType="org.jeecg.modules.documents.letterDeposit.entity.VO.SyPreAssembledPackingListVo">
+
+select a.id as id,GROUP_CONCAT(b.id) as itemId,a.item_number as itemNumber,a.pre_delivery_date as preDeliveryDate ,b.inventory_name as inventoryName,b.po_no as poNo,b.distribution_point as distributionPoint,
+a.memo,a.customer,b.colour,sum(b.box_number) as  boxNumber,b.pur_or_sub_order as spurOrSubOrder,
+sum(a.total_net_weight) as totalNetWeight,a.order_type as orderType,sum(b.total_quantity) as totalQuantity
+sum(a.total_gross_weight) as totalGrossWeight,sum(a.total_volume) as totalVolume,a.total_price as totalPrice,b.factory_unit_price as factoryUnitPrice,
+a.depositary_receipt_no as depositaryReceiptNo from sy_pre_assembled_packing_list a
+left join sy_pre_assembled_packing_list_item b
+on a.id = b.sy_pre_assembled_packing_list_id and b.del_flag = 0
+  ${ew.customSqlSegment}
+
+    </select>
 </mapper>

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

@@ -39,5 +39,8 @@ public interface ISyLetterDepositService extends IService<SyLetterDeposit> {
     //预托书删除
     public int syLetterDepositDelete(String id);
 
+    //合并参照预装箱单数据
+    IPage<SyPreAssembledPackingListVo> mergeSyPreAssembledPackingList(IPage<SyPreAssembledPackingListVo> page, QueryWrapper<SyPreAssembledPackingListVo> queryWrapper);
+
 
 }

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

@@ -222,4 +222,15 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
             return 0;
         }
     }
+
+    /**
+     * 预装箱单数据合并
+     * @param page
+     * @param queryWrapper
+     * @return
+     */
+    @Override
+    public IPage<SyPreAssembledPackingListVo> mergeSyPreAssembledPackingList(IPage<SyPreAssembledPackingListVo> page, QueryWrapper<SyPreAssembledPackingListVo> queryWrapper) {
+        return syLetterDepositMapper.mergeSyPreAssembledPackingList(page, queryWrapper);
+    }
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -705,21 +705,36 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	 public Result<List<OrderDataVo>> displayDetails(@RequestBody List<String> itemId){
 
 	 	Result<List<OrderDataVo>> result = new Result<>();
+	 	int m = 0;
+	 	//订单子表明细ID集合
 	 	List<String> stringList = new ArrayList<>();
+	 	//分组ID集合
+	 	List<String> groupIdList = new ArrayList<>();
+
 		 QueryWrapper<OrderDataVo> queryWrapper = new QueryWrapper<>();
 
 		 Page<OrderDataVo> page = new Page<OrderDataVo>(1, -1);
 
 		 for(String ids:itemId){
+			 groupIdList.add(oConvertUtils.getId());
 			 String itemIdSplit[] = ids.split(",");
 			 for (String li:itemIdSplit){
 				 stringList.add(li);
+
 			 }
+
 		 }
 		 queryWrapper.in("b.id",stringList).eq("a.del_flag",0);
 
 		 IPage<OrderDataVo> pageList = syShippingDetailsMapper.displayDetails(page, queryWrapper);
-
+		 for(String ids:itemId){
+			 for (OrderDataVo li:pageList.getRecords()){
+				 if(ids.contains(li.getSyOrderDataItemId())){
+					 li.setGroupId(groupIdList.get(m));
+				 }
+			 }
+			 m++;
+		 }
 		 result.setSuccess(true);
 		 result.setMessage("查询成功！");
 		 result.setResult(pageList.getRecords());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/SyShippingDetailsItem.java

@@ -273,4 +273,14 @@ public class SyShippingDetailsItem {
 	@ApiModelProperty(value = "存货编码")
 	private java.lang.String inventoryCode;
 
+	/**箱数*/
+	@Excel(name = "箱数", width = 15)
+	@ApiModelProperty(value = "箱数")
+	private java.math.BigDecimal boxNumber;
+
+	/**分组ID*/
+	@Excel(name = "分组ID", width = 15)
+	@ApiModelProperty(value = "分组ID")
+	private String groupId;
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/OrderDataVo.java

@@ -183,4 +183,7 @@ public class OrderDataVo {
     @ApiModelProperty(value = "订单子表ID")
     private String syOrderDataItemId;
 
+    //分组ID
+    private String groupId;
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -50,63 +50,38 @@ ${ew.customSqlSegment}
 
     <select id="pushSyShipping" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingVO">
 
-        select account as tenantId,
-        id as accessoriesHeaderId,
-        document_no as packingHeaderNum,--'ACCESSORIES0609-2'
-        'ACCESSORIES' as packingType,
-        'NEW' as packingStatus,
-        --'PO36202206070001' as poNo,
-        --'JAZS001' as containerNumm,
-       --  '2022-06-07' as loadingDate,
-         '01000229' as supplierNumber,
-          --'' as invoiceNum,
-          create_by as preparer,
-          create_time as preparationTime
+        select
+        document_no as packingHeaderNum,--装箱单编号-(发运明细单号)
+        'ACCESSORIES' as packingType,--装箱单类型-(发运明细类型，默认ACCESSORIES)
+        'NEW' as packingStatus,--装箱单状态-(发运明细状态，默认NEW)
+         '01000229' as supplierNumber,--供应商编码（收货）(收货方供应商编码)
+          create_by as preparer,--制单人
+          create_time as preparationTime--制单时间
           from sy_shipping_details
-         where del_flag = 0 and id = #{id}
+          where del_flag = 0 and id = #{id}
 
     </select>
 
     <select id="pushSyShippingDeial" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingDeialVo">
 
         select
-        --'103' as tenantId,
-         -- a.id as accessoriesLineId,
-          --id as accessoriesHeaderIdD,
-          a.sort as packingLineNum,
-          'T0036' as merchandiser,
-          a.order_number as poNo,--'PO36202206070001'
-          a.sy_order_data_id as moDetailId,
-           --'' as poId,
-          a.item_number as styleNo, --'W21-W20-MSP-SPW0001'
-         -- 'C156St2' as batchNo,
-           b.colour as color,
-           'N0201002139' as itemCode,
-           '' as itemId,
-          '全涤绒布' as itemDesc,
-          '针织布' as declarationName,
-          '全涤' as composition,
-          '190' as width,
-          '' as rolls,
-          '43' as planPackingQty,
-          '21' as actualPackingQty,
-          '33' as grossWeight,
-          '21' as netWeight,
-          '32' as length,
-          '' as clothWeight,
-          '12' as cartons,
-          '6.32' as unitPrice,
-          '45.21' as totalPrice,
-          '' as gramWeight,
-          '01000229' as supplierNumber,
-          '' as supplierId,
-          '' as supplierTenantId,
-          '打卷' as packingMethod,
-          a.treatment_method as treatmentMethod,
-          a.manual_yarn_flag as manualYarnFlag,
-          a.manual_yarn_unit_price as manualYarnUnitPrice,
-          a.manual_yarn_proportion as manualYarnProportion,
-          a.memo as remark,
+          a.sort as packingLineNum, -- 行号-(发运明细行号)
+          a.order_number as poNo,--计划单号-(订单号)
+          a.sy_order_data_id as moDetailId,--计划单号行ID-(订单号行ID（母件）)
+          a.item_number as styleNo, --款号
+           b.colour as color,--颜色
+           a.inventory_code as itemCode,--物料编码-（存货编码）
+          a.inventory_name as itemDesc,--项目（辅料品名）-（存货名称）
+          '' as declarationName,--报关品名
+          a.material_composition as composition,--成分-（物料成分）
+          b.guangpei_gate_width as width,--门幅
+          '' as rolls,--匹数
+          a.shipment_quantity as planPackingQty,--计划装箱数量-(发货数量)
+          a.treatment_method as treatmentMethod,--处理方式
+          a.manual_yarn_flag as manualYarnFlag,--是否手册纱
+          a.manual_yarn_unit_price as manualYarnUnitPrice,--手册纱单价
+          a.manual_yarn_proportion as manualYarnProportion,--手册纱占比
+          a.memo as remark,--备注
           '111' as cabinetNum
           from sy_shipping_details_item a
           left join sy_order_data_item b

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/MOMainController.java

@@ -103,7 +103,7 @@ public class MOMainController implements ApplicationContextAware {
                             "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId',mo.cDefine11 as headerAttributeString13," +
                             "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
-                            "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cCurrentAuditor as headerAttributeString12," +
+                            "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cVerifier as headerAttributeString12," +
                             "0 as 'totalAmount',mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3',de.cDepName as headerAttributeString14," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +
@@ -130,7 +130,7 @@ public class MOMainController implements ApplicationContextAware {
                             "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId',mo.cDefine11 as headerAttributeString13," +
                             "mo.cDefine5 as headerAttributeBigint2,'' as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
-                            "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cCurrentAuditor as headerAttributeString12," +
+                            "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cVerifier as headerAttributeString12," +
                             "0 as 'totalAmount',mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3',de.cDepName as headerAttributeString14," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +
@@ -156,7 +156,7 @@ public class MOMainController implements ApplicationContextAware {
                             "'' as 'sourceDocNum',mo.cMaker as 'customerContacts',mo.dCreateTime  as 'publishDate',0 as 'tenantId',mo.cDefine11 as headerAttributeString13," +
                             "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
-                            "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cCurrentAuditor as headerAttributeString12," +
+                            "mo.cVenAccount as headerAttributeString8,hr.cDept_num as 'headerAttributeString11',mo.cVerifier as headerAttributeString12," +
                             "0 as 'totalAmount',mo.cCode as 'headerAttributeString2','' as 'headerAttributeString3',de.cDepName as headerAttributeString14," +
                             "'' as 'headerAttributeString4'  from OM_MOMain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             " left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/POPomainController.java

@@ -96,7 +96,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.dPODate as 'customerDemandDate', mo.cMemo as 'remark','' as 'sourceDocNum',mo.cDefine11 as headerAttributeString13," +
                             "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
-                            "mo.cVenAccount as headerAttributeString8,mo.cCurrentAuditor as headerAttributeString12,de.cDepName as headerAttributeString14," +
+                            "mo.cVenAccount as headerAttributeString8,mo.cVerifier as headerAttributeString12,de.cDepName as headerAttributeString14," +
                             "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
                             " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +
@@ -123,7 +123,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.dPODate as 'customerDemandDate', mo.cMemo as 'remark','' as 'sourceDocNum',mo.cDefine11 as headerAttributeString13," +
                             "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
-                            "mo.cVenAccount as headerAttributeString8,mo.cCurrentAuditor as headerAttributeString12,de.cDepName as headerAttributeString14," +
+                            "mo.cVenAccount as headerAttributeString8,mo.cVerifier as headerAttributeString12,de.cDepName as headerAttributeString14," +
                             "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
                             " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +
@@ -149,7 +149,7 @@ public class POPomainController implements ApplicationContextAware {
                             "mo.dPODate as 'customerDemandDate', mo.cMemo as 'remark','' as 'sourceDocNum',mo.cDefine11 as headerAttributeString13," +
                             "mo.cDefine5 as headerAttributeBigint2,ex.chdefine2 as headerAttributeString1,mo.cDefine12 as headerAttributeString3," +
                             "mo.cDefine13 as headerAttributeString4,mo.cDefine14 as headerAttributeString5,mo.cVenBank as headerAttributeString7," +
-                            "mo.cVenAccount as headerAttributeString8,mo.cCurrentAuditor as headerAttributeString12,de.cDepName as headerAttributeString14," +
+                            "mo.cVenAccount as headerAttributeString8,mo.cVerifier as headerAttributeString12,de.cDepName as headerAttributeString14," +
                             "mo.cMaker as 'customerContacts',hr1.cPsn_Name as headerAttributeString10,mo.cAuditDate as cAuditDate," +
                             " mo.cmaketime  as 'publishDate'  from PO_Pomain mo left join Vendor ven on mo.cVenCode = ven.cVenCode " +
                             "left join (select cPsn_Num, cPsn_Name,cDept_num from hr_hi_person) hr " +

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/PurchaseWarehousingController.java

@@ -268,11 +268,11 @@ public class PurchaseWarehousingController extends JeecgController<PurchaseWareh
 				  String cAccId=jsonObject.get("cAccId").toString();
 				  //转map
 				  Map<String,Object> map=updateMap(jsonObject);
-				  if(cAccId.equals("101")){
+				  if(cAccId.equals("901")){
 					  mapListOne.add(map);
-				  }else if(cAccId.equals("102")){
+				  }else if(cAccId.equals("902")){
 					  mapListTwo.add(map);
-				  }else if(cAccId.equals("103")){
+				  }else if(cAccId.equals("903")){
 					  mapListThree.add(map);
 				  }
 			  }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/xml/PurchaseWarehousingMapper.xml

@@ -992,8 +992,7 @@
 
     <select id="getOM_MOMaterials" resultType="java.util.HashMap" parameterType="java.util.HashMap">
         select * from OM_MOMaterials where
-            MoDetailsID = #{map.MoDetailsID}
-           and cInvCode = #{map.cInvCode}
+                    MoDetailsID = #{map.moDetailId}
            AND isnull(cFree1,'') = #{map.cFree1}
            AND isnull(cFree2,'') = #{map.cFree2}
            AND isnull(cFree3,'') = #{map.cFree3}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.java

@@ -991,13 +991,14 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
         if(mapList!=null&&mapList.size()>0){
             for(Map<String,Object> map:mapList){
                 map.put("CACCID",accId);//账套
-                map.put("CVOUCHCODE",map.get("CORDERCODE"));//单号
+                map.put("CVOUCHCODE",map.get("cOrderCode"));//单号
+                map.put("DDATE",map.get("dDate"));//单据日期
                 //获取汇率、币种
                 //根据订单号获取委外订单
-                Map<String,Object> OM_MOmainMap=this.baseMapper.getOM_MOmainBycCode(String.valueOf(map.get("CORDERCODE")));
+                Map<String,Object> OM_MOmainMap=this.baseMapper.getOM_MOmainBycCode(String.valueOf(map.get("cOrderCode")));
                 if(OM_MOmainMap!=null){
                     //根据供应商查仓库
-                    String supplierCode = this.baseMapper.querySupplierCode(map.get("supplierCode").toString());
+                    String supplierCode = this.baseMapper.querySupplierCode(OM_MOmainMap.get("cVenCode").toString());
                    // map.put("CWHCODE",OM_MOmainMap.get("cOWhCode"));
                     map.put("CWHCODE",supplierCode);//出库编码
                     map.put("CRDCODE","22");//出库类别
@@ -1033,7 +1034,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                     throw new RuntimeException("委外订单没有匹配的订单号");
                 }
                 //子表
-                List<Map<String,Object>> itemMapList=(List<Map<String,Object>>)map.get("DETAILList");
+                List<Map<String,Object>> itemMapList=(List<Map<String,Object>>)map.get("detailList");
                 if(itemMapList!=null&&itemMapList.size()>0){
                     Integer rowId=1;
                     for(Map<String,Object> itemMap:itemMapList){
@@ -1084,7 +1085,12 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
         if(mapList!=null&&mapList.size()>0){
             for(Map<String,Object> map:mapList){
                 //主表
-                JSONObject saveJson=new JSONObject();
+                JSONObject saveJson=new JSONObject();//0412
+                String cCode=oConvertUtils.addOne(this.baseMapper.getMaxCode("cCode","rdrecord11","dnmaketime"));
+                saveJson.put("cCode",cCode);
+                System.out.println("单据编号："+cCode);
+                //修改最大编码
+                this.baseMapper.updateVoucherHistoryCNumber(oConvertUtils.maxNumber(String.valueOf(saveJson.get("cCode"))),"0412");
                 saveJson.put("CACCID",accID);
                 saveJson.put("CVOUCHCODE",map.get("CVOUCHCODE"));
                 saveJson.put("CBUSTYPE",map.get("CBUSTYPE"));
@@ -1098,15 +1104,15 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                 saveJson.put("CMEMO",map.get("CMEMO"));
                 saveJson.put("CMAKER",map.get("CMAKER"));
                 saveJson.put("CHANDLER",map.get("CHANDLER"));
-                List<Map<String,Object>> itemMapList=(List<Map<String,Object>>)map.get("DETAILList");
+                List<Map<String,Object>> itemMapList=(List<Map<String,Object>>)map.get("detailList");
                 //子表
                 if(itemMapList!=null&&itemMapList.size()>0){
                     JSONArray itemJsonArray=new JSONArray();
                     for(Map<String,Object> m:itemMapList){
                         JSONObject saveItemJson=new JSONObject();
                         saveItemJson.put("CINVCODE",m.get("CINVCODE"));
-                        saveItemJson.put("IQUNTITY",m.get("IQUNTITY"));
-                        saveItemJson.put("CBATCH",m.get("CBATCH"));
+                        saveItemJson.put("IQUANTITY",m.get("iQuntity"));
+                        saveItemJson.put("CBATCH",m.get("cBatch"));
                         saveItemJson.put("AUTOID_PO",m.get("AUTOID_PO"));
                         saveItemJson.put("ALLCAUTOIDCOL",m.get("ALLCAUTOIDCOL"));
                         //获取自定义项 自由项 批次项