bug调整

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

@@ -34,4 +34,7 @@ public class SyRmb {
     @ApiModelProperty(value = "项目列名称")
     private String itemColumnName;
 
+    @ApiModelProperty(value = "是否推送")
+    private String isPull;
+
 }

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

@@ -35,4 +35,7 @@ public class SyUsd {
 
     @ApiModelProperty(value = "项目列名称")
     private String itemColumnName;
+
+    @ApiModelProperty(value = "是否推送")
+    private String isPull;
 }

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

@@ -29,37 +29,35 @@ on a.id = b.sy_pre_assembled_packing_list_id
 
 
     <insert id="syRmbAdd">
-        insert into sy_rmb (id, sy_letter_deposit_id, freight_forwarder, amount, item_column,del_flag,freight_forwarder_name,item_column_name)
+        insert into sy_rmb (id, sy_letter_deposit_id, freight_forwarder, amount, item_column,del_flag,freight_forwarder_name,item_column_name,is_pull)
         values
         <foreach collection="rmbList" item="rmbList" separator=",">
             (
-            #{rmbList.id}, #{rmbList.syLetterDepositId}, #{rmbList.freightForwarder}, #{rmbList.amount}, #{rmbList.itemColumn},0,#{rmbList.freightForwarderName},#{rmbList.itemColumnName}
+            #{rmbList.id}, #{rmbList.syLetterDepositId}, #{rmbList.freightForwarder}, #{rmbList.amount}, #{rmbList.itemColumn},0,#{rmbList.freightForwarderName},#{rmbList.itemColumnName},#{rmbList.isPull}
             )
         </foreach>
 
     </insert>
 
     <insert id="syUsdAdd">
-        insert into sy_usd (id, sy_letter_deposit_id, freight_forwarder, amount, item_column,del_flag,freight_forwarder_name,item_column_name)
+        insert into sy_usd (id, sy_letter_deposit_id, freight_forwarder, amount, item_column,del_flag,freight_forwarder_name,item_column_name,is_pull)
         values
         <foreach collection="usdList" item="usdList" separator=",">
             (
-            #{usdList.id}, #{usdList.syLetterDepositId}, #{usdList.freightForwarder}, #{usdList.amount}, #{usdList.itemColumn},0,#{usdList.freightForwarderName},#{usdList.itemColumnName}
+            #{usdList.id}, #{usdList.syLetterDepositId}, #{usdList.freightForwarder}, #{usdList.amount}, #{usdList.itemColumn},0,#{usdList.freightForwarderName},#{usdList.itemColumnName},#{usdList.isPull}
             )
         </foreach>
 
     </insert>
 
     <update id="syRmbDelete">
-        update sy_rmb
-        set del_flag = '1'
+       delete from sy_rmb
         where sy_letter_deposit_id = #{syLetterDepositId}
 
     </update>
 
     <update id="syUsdDelete">
-        update sy_usd
-        set del_flag = '1'
+        delete from sy_usd
         where sy_letter_deposit_id = #{syLetterDepositId}
 
     </update>

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

@@ -143,24 +143,29 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getDocumentNo())){
 			queryWrapper.like("t.documentNo",syShippingDetails.getDocumentNo());
 		}
+		//订单号
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getOrderNumber())){
 			queryWrapper.like("t.orderNumber",syShippingDetails.getOrderNumber());
 		}
+		//单据日期
 		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.getSalesman())){
 			queryWrapper.like("t.salesman",syShippingDetails.getSalesman());
 		}
+		//款号
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getItemNumber())){
 			queryWrapper.like("t.itemNumber",syShippingDetails.getItemNumber());
 		}
+		//是否参照
 		if(oConvertUtils.isNotEmpty(refer)){
 			if(refer.equals("0")){
 				queryWrapper.eq("t.isReference","0");
@@ -168,6 +173,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				queryWrapper.ne("t.isReference","0");
 			}
 		}
+		//供应商
 		if(oConvertUtils.isNotEmpty(supplier)){
 			queryWrapper.like("t.supplier",supplier);
 		}
@@ -184,6 +190,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getAccount())){
 			queryWrapper.like("t.account",syShippingDetails.getAccount());
 		}
+		//报关要素
 		if(oConvertUtils.isNotEmpty(isElement)){
 			if(isElement.equals("0")){//没有维护
 				queryWrapper.isNull("t.elementsId");
@@ -192,12 +199,20 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			}
 
 		}
+		//提交状态
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getSubmitStatus())){
 			queryWrapper.eq("t.submitStatus",syShippingDetails.getSubmitStatus());
 		}
+		//ID
 		if(oConvertUtils.isNotEmpty(syShippingDetails.getId())){
 			queryWrapper.like("t.id",syShippingDetails.getId());
 		}
+		//小po
+		if(oConvertUtils.isNotEmpty(syShippingDetails.getSmallPo())){
+			String[] smllSplit = syShippingDetails.getSmallPo().split(",");
+			List<String> asList = Arrays.asList(smllSplit);
+			queryWrapper.in("t.id",asList);
+		}
 
 		Page<SyShippingDetailsVo> page = new Page<SyShippingDetailsVo>(1, -1);
 		if(flourOrGarment.equals("0")){//面辅料
@@ -1102,6 +1117,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			  pushvo.setSuccess(true);
 			  pushvo.setResult(pushShippingDeialVoList.get(0));
 			  pushvo.setMessage("推送成功！");
+
 		  }else{
 			  shippingDetails.setPushState("2");
 			  shippingDetails.setPushMessage(message);

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

@@ -284,7 +284,7 @@ ${ew.customSqlSegment}
         b.material_composition as materialComposition,b.guangpei_gate_width as guangpeiGateWidth,b.weight as weight,b.is_reference as isReference,
         b.excess_quantity as excessQuantity,c.declaration_unit as masterMetering,b.garment_factory as garmentFactory,b.shipment_quantity as shipmentQuantity,
         b.id as itemIds,a.id as id,b.elements_id as elementsId,b.r_supplier_code as rSupplierCode,b.r_supplier as rSupplier,b.account as account,
-        b.supplier,b.supplier_code as supplierCode,b.specification_and_model as specificationAndModel,b.inventory_ccode as inventoryCcode
+        b.supplier,b.supplier_code as supplierCode,b.specification_and_model as specificationAndModel,b.inventory_ccode as inventoryCcode,b.order_quantity as orderQuantity
          from sy_shipping_details a
 left join sy_shipping_details_item b
 on a.id = b.shipping_details_id

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

@@ -1468,34 +1468,38 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 			 //查询人民币信息
 			 List<SyRmb> rmbList = syShippingOrderMapper.rmbList(entity.getId());
-			 //集合转map
-			 for (SyRmb li : rmbList) {
-				 Field[] fieldsList = li.getClass().getDeclaredFields();
-				 Map<String, Object> mapList = new HashMap<String, Object>();
-				 for (Field field : fieldsList) {
-					 field.setAccessible(true);
-					 mapList.put(field.getName(), field.get(li));
+			 if(rmbList.size()!=0) {
+				 //集合转map
+				 for (SyRmb li : rmbList) {
+					 Field[] fieldsList = li.getClass().getDeclaredFields();
+					 Map<String, Object> mapList = new HashMap<String, Object>();
+					 for (Field field : fieldsList) {
+						 field.setAccessible(true);
+						 mapList.put(field.getName(), field.get(li));
+					 }
+					 rmbmap.add(mapList);
 				 }
-				 rmbmap.add(mapList);
 			 }
 
 			 //查询美元信息
 			 List<SyUsd> usdList = syShippingOrderMapper.usdList(entity.getId());
-			 //集合转map
-			 for (SyUsd li : usdList) {
-				 Field[] fieldsList = li.getClass().getDeclaredFields();
-				 Map<String, Object> mapList = new HashMap<String, Object>();
-				 for (Field field : fieldsList) {
-					 field.setAccessible(true);
-					 mapList.put(field.getName(), field.get(li));
+			 if(usdList.size()!=0) {
+				 //集合转map
+				 for (SyUsd li : usdList) {
+					 Field[] fieldsList = li.getClass().getDeclaredFields();
+					 Map<String, Object> mapList = new HashMap<String, Object>();
+					 for (Field field : fieldsList) {
+						 field.setAccessible(true);
+						 mapList.put(field.getName(), field.get(li));
+					 }
+					 usdmap.add(mapList);
 				 }
-				 usdmap.add(mapList);
 			 }
 
 			 //判断是否有美元或者人民币信息
 			 if(rmbmap.size()==0 && usdmap.size()==0){
 				 result.setResult(0);
-				 result.setMessage("推送失败！请填写人民币信息或者美元信息");
+				 result.setMessage("推送失败，无运费信息推送！");
 				 result.setSuccess(false);
 				 return result;
 

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

@@ -79,4 +79,8 @@ public interface SyShippingOrderMapper extends BaseMapper<SyShippingOrder> {
 
     //查询U8 汇率
     public Map<String,Object> queryU8Rate(@Param("year") String year,@Param("month") String month);
+
+    //修改人民币和美元推送状态
+    public void updateRmbIspull(@Param("id") String id);
+    public void updateUsdIspull(@Param("id") String id);
 }

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

@@ -73,12 +73,12 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
 
     <select id="queryListRmb" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyRmb">
         select id,sy_letter_deposit_id as syLetterDepositId,freight_forwarder as freightForwarder,freight_forwarder_name as freight_forwarderName,item_column_name as itemColumnName,
-         amount,item_column as itemColumn  from sy_rmb where del_flag = 0 and sy_letter_deposit_id = #{syLetterDepositId}
+         amount,item_column as itemColumn,is_pull as isPull  from sy_rmb where del_flag = 0 and sy_letter_deposit_id = #{syLetterDepositId}
     </select>
 
     <select id="queryListUsd" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyUsd">
         select id,sy_letter_deposit_id as syLetterDepositId,freight_forwarder as freightForwarder,freight_forwarder_name as freight_forwarderName,item_column_name as itemColumnName,
-         amount,item_column as itemColumn  from sy_usd where del_flag = 0 and sy_letter_deposit_id = #{syLetterDepositId}
+         amount,item_column as itemColumn,is_pull as isPull  from sy_usd where del_flag = 0 and sy_letter_deposit_id = #{syLetterDepositId}
     </select>
 
 
@@ -200,11 +200,11 @@ group by c.group_id) t group by t.elementsId,t.styleNumber,t.smailPo,t.unitPrice
     </select>
 
     <select id="rmbList" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyRmb">
-        select * from sy_rmb where sy_letter_deposit_id = #{id} and del_flag = '0'
+        select * from sy_rmb where sy_letter_deposit_id = #{id} and del_flag = '0' and is_pull = '0'
     </select>
 
     <select id="usdList" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyUsd">
-        select * from sy_usd where sy_letter_deposit_id = #{id} and del_flag = '0'
+        select * from sy_usd where sy_letter_deposit_id = #{id} and del_flag = '0' and is_pull = '0'
     </select>
 
 
@@ -252,4 +252,16 @@ where del_flag = 0 and sy_shipping_order_item_id = #{id}  group by group_id) t
         SELECT nflat FROM exch WHERE iYear = #{year} and iperiod like concat(#{month},'%')
     </select>
 
+    <update id="updateRmbIspull">
+        update sy_rmb
+        set is_pull = '1'
+        where id= #{id}
+    </update>
+
+    <update id="updateUsdIspull">
+        update sy_usd
+        set is_pull = '1'
+        where id= #{id}
+    </update>
+
 </mapper>

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

@@ -328,6 +328,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 li.setId(oConvertUtils.id());
                 li.setSyLetterDepositId(id);
                 li.setDelFlag("0");
+                if(oConvertUtils.isEmpty(li.getIsPull())){
+                    li.setIsPull("0");
+                }
             }
             syLetterDepositMapper.syRmbAdd(rmbList);
         }
@@ -338,6 +341,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 li.setId(oConvertUtils.id());
                 li.setSyLetterDepositId(id);
                 li.setDelFlag("0");
+                if(oConvertUtils.isEmpty(li.getIsPull())){
+                    li.setIsPull("0");
+                }
             }
             syLetterDepositMapper.syUsdAdd(usdList);
         }
@@ -654,7 +660,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     map.put("cCusCode", mapPo.get("cCusCode"));//客户简称
                     map.put("cDefine10", map1.get("shippingOrderNumber"));//外销发票号
                     map.put("cVouchType", "PO");//单据类型
-                    map.put("cMaker", map1.get("createBy"));//制单人
+                    map.put("cMaker", "进出口平台管理员");//制单人
                     map.put("iSourceId", mapPo.get("ID"));//来源ID、
                     map.put("cSourceCode", li.get("orderNumber"));//订单号
                     map.put("cSOCode", li.get("orderNumber"));//订单号
@@ -681,6 +687,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     maps.put("ID", id);
                     maps.put("irowno", ii);//行号
                     listmaps.add(maps);
+
+                    //修改人民币推送状态
+                    syShippingOrderMapper.updateRmbIspull(rmb.get("id").toString());
                 }
             }
 
@@ -713,7 +722,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     map.put("cCusCode", mapPo.get("cCusCode"));//客户简称
                     map.put("cDefine10", map1.get("shippingOrderNumber"));//外销发票号
                     map.put("cVouchType", "PO");//单据类型
-                    map.put("cMaker", map1.get("createBy"));//制单人
+                    map.put("cMaker", "进出口平台管理员");//制单人
                     map.put("iSourceId", mapPo.get("ID"));//来源ID、
                     map.put("cSourceCode", li.get("orderNumber"));//订单号li.get("orderNumber")
                     map.put("cSOCode", li.get("orderNumber"));//订单号
@@ -738,6 +747,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     maps.put("ID", id);
                     maps.put("irowno", ii);//行号
                     listmaps.add(maps);
+
+                    //修改人民币推送状态
+                    syShippingOrderMapper.updateUsdIspull(usd.get("id").toString());
                 }
             }
         }