推送调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.googlecode.aviator.utils.ArrayHashMap;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.system.util.JwtUtil;
@@ -1570,14 +1571,22 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				mapItem6.put("CDEFINE31",item.getDeclarationName());//货物名称
 
 				Order orderIrowno=new Order();
-				if (mapt.get("customerCode").equals("one")){
-					orderDataItem.put("iSOsID",item.getSyOrderDataItemId().substring(3));
-				}
 				System.out.println("新的逻辑id\t"+orderDataItem.get("iSOsID"));
 				//if(item.getSyOrderDataItemId()!=null){//销售发货单 ---查询销售订单子表数据  顺序---5
 				if(orderDataItem!=null&&orderDataItem.containsKey("iSOsID")&&orderDataItem.get("iSOsID")!=null){
-					Map<String,Object> orderDataItem2=syPackingListTailoringMapper.getSoMainItem(orderDataItem.get("iSOsID").toString());
-
+					//Map<String,Object> orderDataItem2=syPackingListTailoringMapper.getSoMainItem(orderDataItem.get("iSOsID").toString());
+					Map<String,Object> orderDataItem2=new HashMap<>();
+					if (mapt.get("orderNumber").equals("one")){
+						String id=item.getSyOrderDataItemId();
+						if ((id.indexOf('('))>-1){
+							id=id.substring(3,id.indexOf("(")-1);
+						}
+						orderDataItem2=syPackingListTailoringMapper.getSoMainItem2(id);
+						mapItem3.put("AUTOID_SO",id);//来源单据明细ID
+					}else{
+						orderDataItem2=syPackingListTailoringMapper.getSoMainItem(orderDataItem.get("iSOsID").toString());
+						mapItem3.put("AUTOID_SO",orderDataItem2.get("iSOsID"));//来源单据明细ID
+					}
 					System.out.println("销售订单\n"+orderDataItem2);
 					orderIrowno.setIrowno(orderDataItem2.get("irowno").toString());
 					orderIrowno.setOrderNumber(orderDataItem2.get("cSOCode").toString());
@@ -1587,7 +1596,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					map6.put("iTaxRate",orderDataItem2.get("iTaxRate"));
 					mapItem6.put("iTaxRate",orderDataItem2.get("iTaxRate"));
 					mapItem3.put("SOAUTOIDCOL","ISOSID");//来源单据明细ID对应字段名(如果取销售订单主键，需传固定值ISOSID)
-					mapItem3.put("AUTOID_SO",orderDataItem2.get("iSOsID"));//来源单据明细ID
 					mapt.put("poid", orderDataItem2.get("id"));
 					//System.out.println("销售订单子表的行号\t"+orderDataItem2.get("irowno"));
 				}else if(mapt.get("account").equals("103")) {
@@ -1731,7 +1739,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			mapt.put("itemSort",mapSort);
 			System.out.println("mapsort\n"+mapSort);
 		}
-
 		if(mapList2!=null&&mapList2.size()>0){
 			text(mapList2,"材料出库单");
 			text(mapList7,"染厂采购入库单");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/SyPackingListTailoringMapper.java

@@ -50,6 +50,9 @@ public interface SyPackingListTailoringMapper extends BaseMapper<SyPackingListTa
     //获取供应商,区分来源
     public Map<String,Object> getSoMainItem(String id);
 
+    //获取供应商,区分来源
+    public Map<String,Object> getSoMainItem2(String id);
+
     //获取前面流程未带下来的数据
     public String getOrderDataId(String id);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -268,6 +268,10 @@
         select iTaxUnitPrice,cast(iTaxRate as decimal(10,3)) iTaxRate,irowno,AutoID,id,iSOsID ,cSOCode   from SO_SODetails where iSOsID=#{id}
     </select>
 
+    <select id="getSoMainItem2" parameterType="java.lang.String" resultType="java.util.HashMap">
+        select iTaxUnitPrice,cast(iTaxRate as decimal(10,3)) iTaxRate,irowno,AutoID,id,iSOsID ,cSOCode   from SO_SODetails where AutoID =#{id}
+    </select>
+
     <select id="getOrderDataId" parameterType="java.lang.String" resultType="java.lang.String">
         SELECT sy_order_data_id  FROM sy_pre_assembled_packing_list WHERE id=#{id}
     </select>