Browse Source

BUG调整

zengtx 2 years ago
parent
commit
284d2ce1de

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

@@ -848,7 +848,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 						  code1 = li.getInventoryCcode().substring(0,4);
 					  }
 
-					  if(!code.equals("04") && !code.equals("05")&& !code.equals("06")&& !code.equals("07")&& !code1.equals("0299")&& !code1.equals("0399")){
+					  if(!code.equals("04") && !code.equals("05")&& !code.equals("06")&& !code.equals("07")&& !code1.equals("0299")&& !code1.equals("0399")&& !code1.equals("0499")){
 						  //判断物料成份。isTc、款号是否为空,为空不允许提交
 						  if(oConvertUtils.isEmpty(li.getItemNumber()) || oConvertUtils.isEmpty(li.getMaterialComposition()) || oConvertUtils.isEmpty(li.getIsTc())){
 							  result.setSuccess(false);

+ 3 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -127,11 +127,11 @@ select t.id, t.hsCode,sum(t.boxNumber) as boxNumber, t.declarationName,t.english
 round(sum(t.totalPrice),2) as totalPrice,round(sum(t.grossWeight),2) as grossWeight,round(sum(t.netWeight),2) as netWeight,t.pcs,t.pacs,
 round(sum(t.volume),3) as volume,t.curr,t.dree,t.place,t.certificate,t.styleNumber,t.smailPo,t.orderNumber,t.ctns,t.kgs,t.cbm,pkOrg,t.factoryUnitPrice,
 t.outerBoxLength,t.outerBoxWidth,t.outerBoxHeight,t.hod,t.unIt,t.emp,t.purchaseOutsourcingOrderNo,t.packId,t.salesman,t.earliestDeliveryDate,t.declarationUnit,
-t.clientAbbreviation from (
+t.clientAbbreviation,t.pcGw,t.priceGw from (
 select GROUP_CONCAT(a.id) as id,b.hs_code as hsCode,b.declaration_name as declarationName,b.english_product_name as englishProductName,sum(a.number) as number,a.unit_price as unitPrice,
 sum(a.number*a.unit_price) as totalPrice,a.gross_weight as grossWeight,a.net_weight as netWeight,a.master_metering as pcs,a.volume as volume,a.elements_Id as elementsId,
 'USD' as curr,'CHINA' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,a.box_number as boxNumber,
-a.order_number as orderNumber,a.client_abbreviation as clientAbbreviation,'PCS' as pacs,'CTNS' as ctns,'KGS' as kgs,'CBM' as cbm,c.salesman as salesman,
+a.order_number as orderNumber,a.client_abbreviation as clientAbbreviation,'PCS' as pacs,'CTNS' as ctns,'KGS' as kgs,'CBM' as cbm,c.salesman as salesman,'PC' as pcGw,'/PC' as priceGw,
 c.factory_Unit_Price as factoryUnitPrice,c.outer_box_length as outerBoxLength,c.outer_box_width as outerBoxWidth,c.outer_box_height as outerBoxHeight,c.hod as hod,min(c.hod) as earliestDeliveryDate,
 a.pk_org as pkOrg,round((a.unit_price*0.9),2) as unIt,'' as emp,a.purchase_outsourcing_order_no as purchaseOutsourcingOrderNo,c.pack_id as packId,b.declaration_unit as declarationUnit
  from sy_shipping_order_item a
@@ -166,7 +166,7 @@ group by c.group_id) t group by t.elementsId,t.styleNumber,t.smailPo,t.unitPrice
     <foreach collection="ids" item="item" separator="," open="(" close=")">
         #{item}
     </foreach>
-    group by c.hs_code,c.declaration_name
+    group by c.hs_code,c.declaration_name,c.declaration_unit
 
     </select>
 

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

@@ -174,15 +174,16 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setDelFlag("0");
                         syShippingOrderItem.setStyleNumber(itemli.getItemNumber());
                         syShippingOrderItem.setNumber(itemli.getNetWeight());//数量(取实际报关数量),2023.1.2现在改为取净重
-
-                        if((itemli.getInventoryCcode().indexOf("03")!=-1&&!itemli.getInventoryCcode().equals("0399")) ||
-                                (itemli.getInventoryCcode().indexOf("02")!=-1&&!itemli.getInventoryCcode().equals("0299"))||
-                                (itemli.getInventoryCcode().indexOf("04")!=-1&&!itemli.getInventoryCcode().equals("0499"))){
-
-                            syShippingOrderItem.setReadyFabric("面料");
+                        String sub = itemli.getInventoryCcode().substring(0,2);
+                        String sub2 = "";
+                        if(itemli.getInventoryCcode().length() >= 4){
+                            sub2 = itemli.getInventoryCcode().substring(0,4);
+                        }
+                        if(sub.equals("05")||sub.equals("06")||sub.equals("07")|| sub2.equals("0299")|| sub2.equals("0399") || sub2.equals("0499")){
+                            syShippingOrderItem.setReadyFabric("辅料");
                             syShippingOrderItem.setBoxNumber(itemli.getRolls());
                         }else{
-                            syShippingOrderItem.setReadyFabric("料");
+                            syShippingOrderItem.setReadyFabric("料");
                             syShippingOrderItem.setBoxNumber(itemli.getRolls());
                         }