发运明细批量提交，预托书调整

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

@@ -133,6 +133,18 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 				result.setMessage("保存失败，表体数据不能为空！");
 				return result;
 			}
+
+			//判断预托书号是否唯一
+			String depositaryReceiptNo = syLetterDeposit.getDepositaryReceiptNo();
+			QueryWrapper<SyLetterDeposit> queryWrapper = new QueryWrapper();
+			queryWrapper.eq("depositary_receipt_no",depositaryReceiptNo).eq("del_flag",0);
+             List<SyLetterDeposit> list = syLetterDepositService.list(queryWrapper);
+             if(list.size()>0){
+				 result.setSuccess(false);
+				 result.setMessage("预托书号已存在，请重新维护！");
+				 return result;
+			 }
+
 			SyLetterDeposit entity = syLetterDepositService.syLetterDepositAdd(syLetterDeposit);
 			result.setSuccess(true);
 			result.setMessage("保存成功！");

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

@@ -214,6 +214,7 @@ public class SyLetterDepositItem {
 	@Excel(name = "小po", width = 15)
 	@ApiModelProperty(value = "小po")
 	private java.lang.String smallPo;
-
-
+	@Excel(name = "预装箱单单据号", width = 15)
+	@ApiModelProperty(value = "预装箱单单据号")
+	private String preAssembledPackingNo;
 }

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

@@ -17,6 +17,8 @@ public class SyPreAssembledPackingListVo {
     private String id;
     @ApiModelProperty(value = "子表ID")
     private String itemId;
+    @ApiModelProperty(value = "预装箱单单据号")
+    private String documentNo;
 
     /**款号*/
     @ApiModelProperty(value = "款号")

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

@@ -5,7 +5,7 @@
 
     <select id="querySyPreAssembledPackingList" 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,
+select a.document_No as documentNo,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.ac_set_no as acSetNo,sum(b.total) as total,a.customer_abbreviation as customerAbbreviation,
 sum(b.total_net_weight) as totalNetWeight,a.order_type as orderType,b.total_quantity as totalQuantity,b.small_Po as smallPo,b.unit_price as unitPrice,
 sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,sum(b.total_price) as totalPrice,b.factory_unit_price as factoryUnitPrice,
@@ -92,7 +92,7 @@ on a.id = b.sy_letter_deposit_id
 
     <select id="queryItem" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem">
 
-        select item_number as itemNumber,small_po as smallPo,total,box_number as boxNumber,pre_ids as preIds,
+        select item_number as itemNumber,small_po as smallPo,total,box_number as boxNumber,pre_ids as preIds,sy_pre_assembled_packing_list_id as syPreAssembledPackingListId,
 total_gross_weight as totalGrossWeight,total_net_weight as totalNetWeight,total_volume as totalVolume,distribution_point as distributionPoint,
 container_code as containerCode,container_number as containerNumber,unit_price as unitPrice,total_price as totalPrice,
 hod

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

@@ -13,6 +13,8 @@ import org.jeecg.modules.documents.letterDeposit.mapper.SyLetterDepositMapper;
 import org.jeecg.modules.documents.letterDeposit.service.ISyLetterDepositService;
 import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetails;
 import org.jeecg.modules.documents.shippingDetails.entity.SyShippingDetailsItem;
+import org.jeecg.modules.documents.shippingDetails.service.impl.SyShippingDetailsItemServiceImpl;
+import org.jeecg.modules.documents.shippingDetails.service.impl.SyShippingDetailsServiceImpl;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem;
 import org.jeecg.modules.spapl.service.impl.SyPreAssembledPackingListItemServiceImpl;
@@ -48,6 +50,8 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
     private SyPreAssembledPackingListServiceImpl syPreAssembledPackingListService;
     @Autowired
     private SyPreAssembledPackingListItemServiceImpl syPreAssembledPackingListItemService;
+    @Autowired
+    private SyShippingDetailsItemServiceImpl syShippingDetailsItemService;
 
 
     /**
@@ -165,6 +169,7 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
                     itenPojo.setOrderNumber(li.getOrderNumber());
                     itenPojo.setItemNumber(li.getItemNumber());
                     itenPojo.setSmallPo(syper.getSmallPo());
+                    itenPojo.setPreAssembledPackingNo(li.getPreAssembledPackingNo());
 
                     syLetterDepositItemList.add(itenPojo);
 
@@ -173,7 +178,7 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
                     SyShippingDetailsItem syshippingItem = new SyShippingDetailsItem();
                     syshippingItem.setId(shippingIds);
                     syshippingItem.setIsReference(1);
-
+                    syShippingDetailsItemService.updateById(syshippingItem);
                 }
                 //回写预装箱单主表预托书号
                 String preId = li.getSyPreAssembledPackingListId();

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

@@ -106,7 +106,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	@ApiOperation(value="发运明细主表-分页列表查询", notes="发运明细主表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<SyShippingDetailsVo>> queryPageList(SyShippingDetailsVo syShippingDetails,String startTime,String endTime,String flourOrGarment,
-								   String refer,
+								   String refer,String preDeliveryDateB,String preDeliveryDateE,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
@@ -119,10 +119,13 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			queryWrapper.eq("t.documentNo",syShippingDetails.getDocumentNo());
 		}
 		if(oConvertUtils.isNotEmpty(startTime)){
-
 		    queryWrapper.ge("t.documentDate",startTime);
 			queryWrapper.le("t.documentDate",endTime);
 		}
+		if(oConvertUtils.isNotEmpty(preDeliveryDateB)){
+			queryWrapper.ge("t.preDeliveryDate",preDeliveryDateB);
+			queryWrapper.le("t.preDeliveryDate",preDeliveryDateE);
+		}
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getPreDeliveryDate())){
 			queryWrapper.eq("t.preDeliveryDate",syShippingDetails.getPreDeliveryDate());
 		}
@@ -461,34 +464,32 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 
 	  try {
 
-		  if(oConvertUtils.isEmpty(syShippingDetails.getId())){
+		  if(syShippingDetails.getSubmitListId().size()==0){
 			  result.setMessage("未拿到ID");
 			  result.setSuccess(false);
 			  return  result;
 		  }
-		  //判断是否有该数据
-		  SyShippingDetails shippingDetails = syShippingDetailsService.getById(syShippingDetails.getId());
-		  if(oConvertUtils.isEmpty(shippingDetails)){
-			  result.setMessage("未找到该数据！");
-			  result.setSuccess(false);
-			  return  result;
+
+		  List<String> idsList = new ArrayList<>();
+
+		  List<String> submitListId = syShippingDetails.getSubmitListId();
+		  for(String str:submitListId ){
+		  	String idsArray[] = str.split(",");
+
+		  	for(String arr:idsArray){
+				idsList.add(arr);
+			}
 		  }
-		  //判断是否已提交
-//		  if(shippingDetails.getState().equals("1") && syShippingDetails.getType().equals("1")){
-//			  result.setMessage("该单据已提交，不允许再次提交！");
-//			  result.setSuccess(false);
-//			  return  result;
-//		  }
-		  int i = syShippingDetailsService.syShippingDetailsSubmit(syShippingDetails.getId(),syShippingDetails.getType());
+		  int i = syShippingDetailsService.batchSubmission(idsList,syShippingDetails.getType());
 		  if(i>0){
 			  if(syShippingDetails.getType().equals("1")){
 				  result.setSuccess(true);
 				  result.setMessage("提交成功");
-				  result.setResult(shippingDetails);
+				  result.setResult(syShippingDetails);
 			  }else{
 				  result.setSuccess(true);
 				  result.setMessage("取消提交成功");
-				  result.setResult(shippingDetails);
+				  result.setResult(syShippingDetails);
 			  }
 		  }
 
@@ -515,7 +516,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
   @AutoLog(value = "发运明细查询订单")
   @ApiOperation(value="发运明细查询订单", notes="发运明细查询订单")
   @GetMapping(value = "/queryOrderData")
-  public Result<IPage<OrderDataVo>> queryOrderData(String orderNumber,String account,String startDeliveryDate,String endDeliveryDate,
+  public Result<IPage<OrderDataVo>> queryOrderData(String orderNumber,String account,String startDeliveryDate,String endDeliveryDate,String smallPo,
 												   String salesman,String customerName,String flourOrGarment,String preDeliveryDateS,String preDeliveryDateE,
 												   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 												   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -548,7 +549,9 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		  queryWrapper.ge("b.pre_delivery_date", preDeliveryDateS);
 		  queryWrapper.le("b.pre_delivery_date", preDeliveryDateE);
 	  }
-
+	  if (oConvertUtils.isNotEmpty(smallPo)) {
+		  queryWrapper.like("b.small_po", smallPo);
+	  }
 	  queryWrapper.eq("a.del_flag", 0);
 	  queryWrapper.eq("b.del_flag", 0);
 	  queryWrapper.gt("b.surplus_num", 0);

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

@@ -146,5 +146,10 @@ public class SyShippingDetails {
 	@ApiModelProperty(value = "整单合计")
 	private java.math.BigDecimal wholeOrderTotal;
 
+	/**批量提交集合*/
+	@Excel(name = "批量提交集合", width = 15)
+	@ApiModelProperty(value = "批量提交集合")
+	@TableField(exist = false)
+	List<String> submitListId;
 
 }

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

@@ -360,4 +360,8 @@ public class SyShippingDetailsItem {
 	private java.lang.String ompoIdItem;
 	//佣金
 	private java.math.BigDecimal ymoney;
+
+	@Excel(name = "提交1，取消提交0", width = 15)
+	@ApiModelProperty(value = "最底层供应商名称")
+	private Integer submitStatus;
 }

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

@@ -237,7 +237,7 @@ public class SyShippingDetailsVo {
     /**状态（0保存，1提交）*/
   //  @Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
-    private String state;
+    private String submitStatus;
     /**推送状态*/
   //  @Excel(name = "推送状态", width = 15)
     @ApiModelProperty(value = "推送状态")
@@ -264,6 +264,11 @@ public class SyShippingDetailsVo {
     @ApiModelProperty(value = "预完工日期")
     private java.util.Date preCompletionDate;
 
+    /**规格型号*/
+    @Excel(name = "规格型号", width = 15)
+    @ApiModelProperty(value = "规格型号")
+    private String specificationAndModel;
+
 
     //0-面辅料/1-成衣
     private String flourOrGarment;

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

@@ -52,4 +52,7 @@ public interface SyShippingDetailsMapper extends BaseMapper<SyShippingDetails> {
 
     //回写报关要素ID字段
     public void writeBackElenmentId(@Param("elementsId") String elementsId,@Param("id") List<String> id);
+
+    //批量提交/取消提交
+    public int batchSubmission(@Param("submitListId") List<String> submitListId,@Param("type") String type);
 }

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

@@ -51,8 +51,8 @@
 
 
 <select id="queryShippingDetails" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo">
-    select t.* from(select b.is_reference as isReference,a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,a.state,
-    b.customer_abbreviation as customerAbbreviation,b.sales_department as salesDepartment,b.salesman as salesman,a.customer as customer,
+    select t.* from(select b.is_reference as isReference,a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,b.submit_status as submitStatus,
+    b.customer_abbreviation as customerAbbreviation,b.sales_department as salesDepartment,b.salesman as salesman,a.customer as customer,b.specification_and_model as specificationAndModel,
     b.small_po as smallPo,b.pack_id as packId,b.pre_delivery_date as preDeliveryDate,a.declaration_name as declarationName,b.order_date as orderDate,
     sum(b.shipment_quantity) as shipmentQuantity,b.customs_declaration_unit_price as customsDeclarationUnitPrice,b.order_quantity as orderQuantity,
     b.is_tc as isTc,a.hs_code as hsCode,b.distribution_point as distributionPoint,b.item_number as itemNumber,b.business_type_text as businessTypeText,
@@ -69,18 +69,15 @@ on a.id = b.shipping_details_id and b.del_flag = 0
 where a.del_flag = 0
   AND b.inventory_ccode like '19%'
 
-GROUP BY a.document_no,
-b.order_number,b.customer_abbreviation,b.sales_department,b.salesman,a.account,b.pre_delivery_date,b.order_remarks,
-			  b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules
-
+GROUP BY b.group_id
  order by a.document_no desc) as t
 ${ew.customSqlSegment}
 
 </select>
 
     <select id="queryShippingDetailsGarment" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.SyShippingDetailsVo">
-    select t.* from(select b.is_reference as isReference,a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,a.state,
-    b.customer_abbreviation as customerAbbreviation,b.sales_department as salesDepartment,b.salesman as salesman,a.customer as customer,
+    select t.* from(select b.is_reference as isReference,a.id as id,GROUP_CONCAT(b.id) as itemIds,a.document_no as documentNo,a.document_date as documentDate,b.order_number as orderNumber,a.push_state,b.submit_status as submitStatus,
+    b.customer_abbreviation as customerAbbreviation,b.sales_department as salesDepartment,b.salesman as salesman,a.customer as customer,b.specification_and_model as specificationAndModel,
     b.small_po as smallPo,b.pack_id as packId,b.pre_delivery_date as preDeliveryDate,a.declaration_name as declarationName,b.order_date as orderDate,
     sum(b.shipment_quantity) as shipmentQuantity,b.customs_declaration_unit_price as customsDeclarationUnitPrice,b.order_quantity as orderQuantity,
     b.is_tc as isTc,a.hs_code as hsCode,b.distribution_point as distributionPoint,b.item_number as itemNumber,b.business_type_text as businessTypeText,
@@ -96,10 +93,7 @@ left join sy_shipping_details_item b
 on a.id = b.shipping_details_id and b.del_flag = 0
 where a.del_flag = 0
   AND b.inventory_ccode not like '19%'
-GROUP BY a.document_no,
-b.order_number,b.customer_abbreviation,b.sales_department,b.salesman,a.account,b.pre_delivery_date,b.order_remarks,
-			  b.item_number,b.small_po,b.inventory_name,b.colour,b.distribution_point,b.pack_id,b.coding_rules
-
+GROUP BY b.group_id
  order by a.document_no desc) as t
 ${ew.customSqlSegment}
 
@@ -212,4 +206,26 @@ ${ew.customSqlSegment}
 
     </update>
 
+    <update id="batchSubmission">
+
+        update sy_shipping_details_item
+        <if test='type == "1"'>
+            set submit_status = 1
+            where id in
+            <foreach collection="submitListId" item="item"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test='type == "2"'>
+            set submit_status = 0
+            where id in
+            <foreach collection="submitListId" item="item"  open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+
+
+    </update>
+
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/ISyShippingDetailsService.java

@@ -41,9 +41,6 @@ public interface ISyShippingDetailsService extends IService<SyShippingDetails> {
     //发运明细删除
     public int syShippingDetailsDelete(String id,List<String> itemId);
 
-    //发运明细提交、取消提交
-    public int syShippingDetailsSubmit(String id,String type);
-
     //发运明细子表删除
     public void syshippingDetailsItemUpdate(String shippingDetailsId);
 
@@ -61,4 +58,7 @@ public interface ISyShippingDetailsService extends IService<SyShippingDetails> {
 
     //回写报关要素ID字段
     public void writeBackElenmentId(String elementsId,List<String> id);
+
+    //批量提交/取消提交
+    public int batchSubmission(List<String> submitListId,String type);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/service/impl/SyShippingDetailsServiceImpl.java

@@ -121,10 +121,6 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
              }
          }
 
-
-
-
-
         boolean ok = save(syShippingDetails);
         if(ok){
             return syShippingDetails;
@@ -177,6 +173,11 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
             //修改
             syShippingDetailsItemService.updateById(li);
         }
+            //修改主表
+           boolean boo =  updateById(syShippingDetails);
+           if(boo){
+               return entity;
+           }
         return entity;
     }
 
@@ -231,27 +232,6 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
     }
 
 
-    /**
-     * 发运明细提交、取消提交
-     * @param id
-     * @return
-     */
-    @Override
-    public int syShippingDetailsSubmit(String id,String type) {
-        int i = 0;
-        SyShippingDetails shippingDetails = getById(id);
-        if(oConvertUtils.isNotEmpty(shippingDetails) && type.equals("1")){
-            shippingDetails.setState("1");
-            updateById(shippingDetails);
-            i = 1;
-        }else if(oConvertUtils.isNotEmpty(shippingDetails) && type.equals("2")){
-            shippingDetails.setState("0");
-            updateById(shippingDetails);
-            i = 1;
-        }
-        return i;
-    }
-
 
     /**
      * 发运明细子表删除
@@ -332,4 +312,21 @@ public class SyShippingDetailsServiceImpl extends ServiceImpl<SyShippingDetailsM
         syShippingDetailsMapper.writeBackElenmentId(elementsId, id);
     }
 
+
+    /**
+     * 提交/取消提交
+     * @param submitListId
+     * @param type
+     * @return
+     */
+    @Override
+    public int batchSubmission(List<String> submitListId, String type) {
+
+        int i = syShippingDetailsMapper.batchSubmission(submitListId,type);
+        if(i>0){
+            return 1;
+        }
+        return 0;
+    }
+
 }

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

@@ -185,11 +185,12 @@ public class PurchaseWarehousingController extends JeecgController<PurchaseWareh
               List<Map<String,Object>> mapListTwo=new ArrayList<>();
               //账套3
               List<Map<String,Object>> mapListThree=new ArrayList<>();
+              String cAccId = "";
               for(int i=0;i<json.size();i++){
                   //获取对象
                   JSONObject jsonObject=json.getJSONObject(i);
                   //获取账套
-                  String cAccId=jsonObject.get("cAccId").toString();
+                  cAccId=jsonObject.get("cAccId").toString();
                   //转map
                   Map<String,Object> map=updateMap(jsonObject);
                   if(cAccId.equals("901")){
@@ -206,6 +207,9 @@ public class PurchaseWarehousingController extends JeecgController<PurchaseWareh
 				  if(StringUtils.isNotBlank(caccId)){
 					  result.error500("未获取到账套");
 				  }
+				  if(!cAccId.equals(caccId)){
+					  result.error500("账套号错误！");
+				  }
                   purchaseWarehousingService.savaOne(mapListOne,caccId);
               }
               if(mapListTwo.size()>0){
@@ -214,6 +218,9 @@ public class PurchaseWarehousingController extends JeecgController<PurchaseWareh
 				  if(StringUtils.isNotBlank(caccId)){
 					  result.error500("未获取到账套");
 				  }
+				  if(!cAccId.equals(caccId)){
+					  result.error500("账套号错误！");
+				  }
                   purchaseWarehousingService.savaTwo(mapListTwo,caccId);
               }
               if(mapListThree.size()>0){
@@ -222,6 +229,9 @@ public class PurchaseWarehousingController extends JeecgController<PurchaseWareh
 				  if(StringUtils.isNotBlank(caccId)){
 					  result.error500("未获取到账套");
 				  }
+				  if(!cAccId.equals(caccId)){
+					  result.error500("账套号错误！");
+				  }
                   purchaseWarehousingService.savaThree(mapListThree,caccId);
               }
               result.success("操作成功");
@@ -261,11 +271,13 @@ public class PurchaseWarehousingController extends JeecgController<PurchaseWareh
 			  List<Map<String,Object>> mapListTwo=new ArrayList<>();
 			  //账套3
 			  List<Map<String,Object>> mapListThree=new ArrayList<>();
+
+			  String cAccId = "";
 			  for(int i=0;i<json.size();i++){
 				  //获取对象
 				  JSONObject jsonObject=json.getJSONObject(i);
 				  //获取账套
-				  String cAccId=jsonObject.get("cAccId").toString();
+				  cAccId=jsonObject.get("cAccId").toString();
 				  //转map
 				  Map<String,Object> map=updateMap(jsonObject);
 				  if(cAccId.equals("901")){
@@ -295,6 +307,9 @@ public class PurchaseWarehousingController extends JeecgController<PurchaseWareh
 				  if(StringUtils.isNotBlank(caccId)){
 					  result.error500("未获取到账套");
 				  }
+				  if(!cAccId.equals(caccId)){
+					  result.error500("账套号错误！");
+				  }
 				  message=message+purchaseWarehousingService.saveMaterialIssueDocOne(mapListOne,caccId,isMaterialIssueDoc);
 			  }
 			  if(mapListTwo.size()>0){
@@ -303,6 +318,9 @@ public class PurchaseWarehousingController extends JeecgController<PurchaseWareh
 				  if(StringUtils.isNotBlank(caccId)){
 					  result.error500("未获取到账套");
 				  }
+				  if(!cAccId.equals(caccId)){
+					  result.error500("账套号错误！");
+				  }
 				  message=message+purchaseWarehousingService.saveMaterialIssueDocTwo(mapListTwo,caccId,isMaterialIssueDoc);
 			  }
 			  if(mapListThree.size()>0){
@@ -311,6 +329,9 @@ public class PurchaseWarehousingController extends JeecgController<PurchaseWareh
 				  if(StringUtils.isNotBlank(caccId)){
 					  result.error500("未获取到账套");
 				  }
+				  if(!cAccId.equals(caccId)){
+					  result.error500("账套号错误！");
+				  }
 				  message=message+purchaseWarehousingService.saveMaterialIssueDocThree(mapListThree,caccId,isMaterialIssueDoc);
 			  }
 			  result.setSuccess(true);