推送调整

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

@@ -1458,7 +1458,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 					mapItem5.put("POAUTOIDCOL","Autoid");//明细ID对应字段名(关联单据类型为采购订单传ID，委外订单传MODetailsID，入库单为Autoid)
 					//mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
-					mapItem5.put("IORITAXCOST",orderDataItem.get("iTaxPrice"));//原币单价
+					mapItem5.put("IORITAXCOST",orderDataItem.get("iNatUnitPrice"));//原币单价
 					/*mapItem5.put("IORIMONEY",orderDataItem.get("iMoney"));//原币金额
 					mapItem5.put("IMONEY",orderDataItem.get("iNatMoney"));//本币金额*/
 				}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -1543,6 +1543,7 @@ public class SyPackingListTailoringController {
 					return result;
 				}else{
 					main.setRecordingStatus(1);
+					main.setPushState("3");//推送中！
 					syPackingListTailoringService.updateById(main);//修改成衣
 				}
 				SyOrderDataItem syOrderDataItem=syOrderDataItemMapper.selectById(syPackingListTailoringItems.get(0).getSyOrderDataItemId());//供应商全称

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

@@ -243,7 +243,7 @@
     </select>
 
     <select id="getOmOrPoItem" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select  iMoney,iNatUnitPrice iTaxPrice ,iNatMoney,iSOsID,${id} as id,inum,iUnitPrice    from ${tableName} where  ${orderName}
+        select  iMoney,iNatUnitPrice, iTaxPrice ,iNatMoney,iSOsID,${id} as id,inum,iUnitPrice    from ${tableName} where  ${orderName}
     </select>
 
     <select id="getSoMain" parameterType="java.lang.String" resultType="java.util.HashMap">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -1291,7 +1291,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					map5.put("CGLTYPE","入库单");
 					mapItem5.put("POAUTOIDCOL","Autoid");//明细ID对应字段名(关联单据类型为采购订单传ID，委外订单传MODetailsID，入库单为Autoid)
 					//mapItem5.put("AUTOID_PO",orderDataItem.get("id"));//明细ID（采购订单行ID/委外订单行ID）
-					mapItem5.put("IORITAXCOST",orderDataItem.get("iTaxPrice"));//原币单价
+					mapItem5.put("IORITAXCOST",orderDataItem.get("iNatUnitPrice"));//原币单价
 					/*mapItem5.put("IORIMONEY",orderDataItem.get("iMoney"));//原币金额
 					mapItem5.put("IMONEY",orderDataItem.get("iNatMoney"));//本币金额*/
 				}