成本分配，托书置换ID

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationFabricMapper.xml

@@ -67,7 +67,19 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
 		and om.cPOID like CONCAT(#{code},'%')
-		) and rs.cBatch like CONCAT(#{code},'%')
+		)
+		GROUP BY i.cInvCode
+			union all
+		select i.cInvCode as cInvCode,max(i.cInvName) as cInvName,sum(rs.iQuantity) as purchaseQuantity,max(rs.cBatch) as cBatch from UFDATA_101_2021.dbo.rdrecords01 rs
+		join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+		where cPOID in (
+		select distinct om.cCode
+		from UFDATA_101_2021.dbo.om_momain om
+		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
+		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		and om.cCode like CONCAT(#{code},'%')
+		)
 		GROUP BY i.cInvCode
 		)tab1
 		right join
@@ -83,7 +95,7 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		)
 		GROUP BY i.cInvCode
-		)tab2 on tab2.cInvCode=tab1.cInvCode and tab2.cBatch=tab1.cBatch
+		)tab2 on tab2.cInvCode=tab1.cInvCode
 		GROUP BY tab2.cInvCode
 		) tab3 on tab3.cInvCode=tab.cInvCode
 
@@ -133,7 +145,19 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
 		and om.cPOID like CONCAT(#{code},'%')
-		) and rs.cBatch like CONCAT(#{code},'%')
+		)
+		GROUP BY i.cInvCode
+		union all
+		select i.cInvCode as cInvCode,max(i.cInvName) as cInvName,sum(rs.iQuantity) as purchaseQuantity,max(rs.cBatch) as cBatch from UFDATA_103_2021.dbo.rdrecords01 rs
+		join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
+		where cPOID in (
+		select distinct om.cCode
+		from UFDATA_103_2021.dbo.om_momain om
+		join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
+		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
+		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
+		and om.cCode like CONCAT(#{code},'%')
+		)
 		GROUP BY i.cInvCode
 		)tab1
 		right join
@@ -148,11 +172,11 @@ where trim(cSOCode) like CONCAT(#{code},'%') and cSOCode not like '%样%'
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
 		)
-		and rs.cBatch = 'SYY140'
 		GROUP BY i.cInvCode
-		)tab2 on tab2.cInvCode=tab1.cInvCode and tab2.cBatch=tab1.cBatch
+		)tab2 on tab2.cInvCode=tab1.cInvCode
 		GROUP BY tab2.cInvCode
 		) tab3 on tab3.cInvCode=tab.cInvCode
+		
 	</select>
 
 

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

@@ -644,15 +644,15 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd 00:00:00.000");
         DecimalFormat df = new DecimalFormat("#.00");
 
-        //记录每次ID
-        String id = "";
+        // ID= 年月日+0+毫秒
+        SimpleDateFormat sf2 = new SimpleDateFormat("yyyyMd0SSS");
         //记录每次单据号
         String cCode = "";
 
         //获取单据号加1
         cCode= org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCodeSalePayVouch("cSPVCode","SalePayVouch","cSPVCode"));
         //获取ID
-        id = org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCodeSalePayVouch("ID","SalePayVouch","ID"));
+        //id = org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCodeSalePayVouch("ID","SalePayVouch","ID"));
         //查询U8汇率
         Map<String, Object> rate = null;
         String nflat = "";
@@ -695,6 +695,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
                 //人民币信息
                 for (Map<String, Object> rmb : rmbList) {
+                    //ID
+                    String id = sf2.format(new Date());
                     ii++;
                     Map<String, Object> map = new HashMap<>();
                     Map<String, Object> mapPo;
@@ -704,7 +706,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
                     if (ii > 1) {
                         cCode = org.jeecg.modules.system.util.oConvertUtils.addOne(cCode);
-                        id = org.jeecg.modules.system.util.oConvertUtils.addOne(id);
+                        //id = org.jeecg.modules.system.util.oConvertUtils.addOne(id);
                         map.put("cSPVCode", cCode);//单据号
                         map.put("ID", id);//ID
                     } else {
@@ -754,6 +756,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
             if(usdList.size()!=0) {
                 //美元信息
                 for (Map<String, Object> usd : usdList) {
+                    //ID
+                    String id = sf2.format(new Date());
                     ii++;
                     Map<String, Object> map = new HashMap<>();
                     Map<String, Object> mapPo;
@@ -763,7 +767,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
                     if (ii > 1) {
                         cCode = org.jeecg.modules.system.util.oConvertUtils.addOne(cCode);
-                        id = org.jeecg.modules.system.util.oConvertUtils.addOne(id);
+                        //id = org.jeecg.modules.system.util.oConvertUtils.addOne(id);
                         map.put("cSPVCode", cCode);//单据号
                         map.put("ID", id);//ID
                     } else {
@@ -833,7 +837,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
             purchaseWarehousingMapper.updateVoucherHistoryCNumber(cCode,"09");
 
             //修改最大ID
-            syShippingOrderMapper.updateUaIdentity(id,itemList.get(0).get("pkOrg").toString());
+            //syShippingOrderMapper.updateUaIdentity(id,itemList.get(0).get("pkOrg").toString());
 
         }catch (Exception e){
             e.printStackTrace();