单证调整

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

@@ -5,11 +5,11 @@
 
     <select id="querySyPreAssembledPackingList" resultType="org.jeecg.modules.documents.letterDeposit.entity.VO.SyPreAssembledPackingListVo">
 
-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,
+select a.document_No as documentNo,a.id as id,GROUP_CONCAT(b.id) as itemId,a.item_number as itemNumber,b.hod 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,
-a.depositary_receipt_no as depositaryReceiptNo,b.spur_or_sub_order as spurOrSubOrder,sum(b.pieces_box) as piecesBox,b.size,a.order_number as orderNumber,
+a.depositary_receipt_no as depositaryReceiptNo,a.spur_Or_Sub_Order as spurOrSubOrder,sum(b.pieces_box) as piecesBox,b.size,a.order_number as orderNumber,
 b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.outer_box_length as outerBoxLength,b.outer_box_width as outerBoxWidth,b.outer_box_height as outerBoxHeight,
 b.garment_factory as garmentFactory,b.hod as hod,b.style_no as styleNo,b.prepack_sku as prepackSku,a.salesman as salesman,a.sales_department
 from sy_pre_assembled_packing_list_item b

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

@@ -489,14 +489,23 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		  itemQueryWrapper.in("id",idsList);
 		  List<SyShippingDetailsItem> list = syShippingDetailsItemService.list(itemQueryWrapper);
 		  if(list.size()!=0){
-
-		  	for (SyShippingDetailsItem li:list){
-		  		if(li.getSubmitStatus() == 1){
-					result.setSuccess(false);
-					result.setMessage("部分单据已提交，请勿重复提交！");
-					return result;
-				}
-			}
+			  if(syShippingDetails.getType().equals("1")) {
+				  for (SyShippingDetailsItem li : list) {
+					  if (li.getSubmitStatus() == 1) {
+						  result.setSuccess(false);
+						  result.setMessage("部分单据已提交，请勿重复提交！");
+						  return result;
+					  }
+				  }
+			  }else{
+				  for (SyShippingDetailsItem li : list) {
+					  if (li.getSubmitStatus() == 0) {
+						  result.setSuccess(false);
+						  result.setMessage("部分单据已取消提交，请勿重复取消提交！");
+						  return result;
+					  }
+				  }
+			  }
 		  }
 
 		  int i = syShippingDetailsService.batchSubmission(idsList,syShippingDetails.getType());

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

@@ -143,21 +143,19 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
                          itemList.add(syShippingOrderItem);
 
-                        //回写预装箱单面料 剩余数量
-                        BigDecimal rema = itemli.getRemainingQuantity();
-                        BigDecimal tatol = rema.subtract(li.getNumber());
-                        itemli.setRemainingQuantity(tatol);
-                        syPackingListFabricItemService.updateById(itemli);
                     }
 
 
-
-                    //回写预装箱面料外销发票号
+                    //查询预装箱但面料数据
                     SyPackingListFabric syPackingListFabric = syPackingListFabricService.getById(li.getTailoringFabricId());
                     if(oConvertUtils.isEmpty(syPackingListFabric)){
                         throw new JeecgBootException("没有查询到装箱单数据！");
                     }
+                    ////回写预装箱面料外销发票号, 剩余数量
                     syPackingListFabric.setExportInvoiceNo(syShippingOrder.getExportInvoiceNo());
+                    BigDecimal rem = syPackingListFabric.getRemainingQuantity();
+                    BigDecimal tatol = rem.subtract(li.getNumber());
+                    syPackingListFabric.setRemainingQuantity(tatol);
                     syPackingListFabricService.updateById(syPackingListFabric);
 
                 }else{ //成衣
@@ -266,13 +264,28 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
             if(li.getReadyFabric().equals("面料")){
 
-
-
-                //回写预装箱单面料 剩余数量
-//                BigDecimal rema = itemli.getRemainingQuantity();
-//                BigDecimal tatol = rema.subtract(li.getNumber());
-//                itemli.setRemainingQuantity(tatol);
-//                syPackingListFabricItemService.updateById(itemli);
+                //查询预装箱但面料数据
+                SyPackingListFabric syPackingListFabric = syPackingListFabricService.getById(li.getTailoringFabricId());
+                if(oConvertUtils.isEmpty(syPackingListFabric)){
+                    throw new JeecgBootException("没有查询到装箱单数据！");
+                }
+                ////回写预装箱面料外销发票号, 剩余数量
+                syPackingListFabric.setExportInvoiceNo(syShippingOrder.getExportInvoiceNo());
+                //箱数减去剩余数量
+                BigDecimal sub = syPackingListFabric.getQuantity().subtract(syPackingListFabric.getRemainingQuantity());
+                BigDecimal tatol = syPackingListFabric.getQuantity().subtract(sub).subtract(li.getNumber());
+                syPackingListFabric.setRemainingQuantity(tatol);
+                syPackingListFabricService.updateById(syPackingListFabric);
+
+            }else{//成衣
+
+                //回写预装箱成衣外销发票号
+                SyPackingListTailoring syPackingListTailoring = syPackingListTailoringService.getById(li.getTailoringFabricId());
+                if(oConvertUtils.isEmpty(syPackingListTailoring)){
+                    throw new JeecgBootException("没有查询到装箱单数据！");
+                }
+                syPackingListTailoring.setExportInvoiceNo(syShippingOrder.getExportInvoiceNo());
+                syPackingListTailoringService.updateById(syPackingListTailoring);
             }
             syShippingOrderItemService.updateById(li);
         }

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

@@ -230,7 +230,9 @@ public class PurchaseWarehousingController extends JeecgController<PurchaseWareh
                   purchaseWarehousingService.savaThree(mapListThree,caccId);
               }
               if(boo == false){
+              	  result.setSuccess(false);
 				  result.success("检查账套号是否正确！");
+				  return result;
 			  }else {
 				  result.success("操作成功");
 			  }
@@ -327,7 +329,9 @@ public class PurchaseWarehousingController extends JeecgController<PurchaseWareh
 				  message=message+purchaseWarehousingService.saveMaterialIssueDocThree(mapListThree,caccId,isMaterialIssueDoc);
 			  }
 			  if(boo == false){
+				  result.setSuccess(false);
 				  result.success("检查账套号是否正确！");
+				  return result;
 			  }else {
 
 				  result.setSuccess(true);