调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/PurchaseWarehousingMapper.java

@@ -25,7 +25,7 @@ public interface PurchaseWarehousingMapper extends BaseMapper<PurchaseWarehousin
      */
     String getMaxId(@Param("id")String id,@Param("tableName")String tableName);
 
-    String getMaxCode(@Param("code")String code,@Param("tableName")String tableName,@Param("dData")String dDate);
+    String getMaxCode(@Param("code")String code,@Param("tableName")String tableName,@Param("dDate")String dDate);
 
     /**
      * @Author chenchuang

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/xml/PurchaseWarehousingMapper.xml

@@ -7,7 +7,7 @@
     </select>
 
     <select id="getMaxCode" resultType="java.lang.String">
-        select top 1 ${code} from ${tableName} ORDER BY #{dDate} desc
+        select top 1 ${code} from ${tableName} ORDER BY ${dDate} desc
     </select>
 
     <insert id="saveRdRecord01One">
@@ -169,7 +169,7 @@
         cFree8,
         cFree9,
         cFree10,
-        cBatchProperty1,
+        cBatchProperty2,
         cBatchProperty8,
         cBatchProperty9
         )
@@ -219,7 +219,7 @@
         #{map.cFree8},
         #{map.cFree9},
         #{map.cFree10},
-        #{map.cBatchProperty1},
+        #{map.cBatchProperty2},
         #{map.cBatchProperty8},
         #{map.cBatchProperty9}
         )
@@ -425,7 +425,7 @@
         cFree8,
         cFree9,
         cFree10,
-        cBatchProperty1,
+        cBatchProperty2,
         cBatchProperty8,
         cBatchProperty9
         )
@@ -470,7 +470,7 @@
         #{map.cFree8},
         #{map.cFree9},
         #{map.cFree10},
-        #{map.cBatchProperty1},
+        #{map.cBatchProperty2},
         #{map.cBatchProperty8},
         #{map.cBatchProperty9}
         )
@@ -549,7 +549,7 @@
         cFree8,
         cFree9,
         cFree10,
-        cBatchProperty1,
+        cBatchProperty2,
         cBatchProperty8,
         cBatchProperty9
         )
@@ -598,7 +598,7 @@
         #{map.cFree8},
         #{map.cFree9},
         #{map.cFree10},
-        #{map.cBatchProperty1},
+        #{map.cBatchProperty2},
         #{map.cBatchProperty8},
         #{map.cBatchProperty9}
         )
@@ -620,7 +620,7 @@
         #{map.cPersonCode},<!--业务员 调拨单业务员-->
         #{map.cDepCode},<!--部门 调拨单转出部门-->
         #{map.ID},
-        0,
+        1,
         '08',
         '调拨',
         '陈创',
@@ -676,7 +676,7 @@
         cFree8,
         cFree9,
         cFree10,
-        cBatchProperty1,
+        cBatchProperty2,
         cBatchProperty8,
         cBatchProperty9)
         VALUES(
@@ -724,7 +724,7 @@
         #{map.cFree8},
         #{map.cFree9},
         #{map.cFree10},
-        #{map.cBatchProperty1},
+        #{map.cBatchProperty2},
         #{map.cBatchProperty8},
         #{map.cBatchProperty9}
         )
@@ -888,7 +888,7 @@
           ,cFree8 = #{map.cFree8}
           ,cFree9 = #{map.cFree9}
           ,cFree10 = #{map.cFree10}
-          ,cBatchProperty1=#{map.cBatchProperty1}
+          ,cBatchProperty2=#{map.cBatchProperty2}
           ,cBatchProperty8=#{map.cBatchProperty8}
           ,cBatchProperty9=#{map.cBatchProperty9}
         where cBatchPropertyGUID=#{map.cBatchPropertyGUID}
@@ -896,7 +896,7 @@
 
     <insert id="saveAA_BatchProperty">
         insert into AA_BatchProperty(
-            cInvCode,cBatch,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10,cBatchProperty1,cBatchProperty8,cBatchProperty9,cBatchPropertyGUID
+            cInvCode,cBatch,cFree1,cFree2,cFree3,cFree4,cFree5,cFree6,cFree7,cFree8,cFree9,cFree10,cBatchProperty2,cBatchProperty8,cBatchProperty9,cBatchPropertyGUID
         )
         values
             (
@@ -912,7 +912,7 @@
                 #{map.cFree8},
                 #{map.cFree9},
                 #{map.cFree10},
-                #{map.cBatchProperty1},
+                #{map.cBatchProperty2},
                 #{map.cBatchProperty8},
                 #{map.cBatchProperty9},
                 #{map.cBatchPropertyGUID}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.java

@@ -154,6 +154,9 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                 if(map.get("cVenCode")!=null){
                     Map<String,Object> whCodeMap= this.baseMapper.getWhCodeByVenCode(cVenCode);
                     if(whCodeMap!=null){
+                        //获取供应商简称
+                        map.put("cVenAbbName",whCodeMap.get("cVenAbbName"));
+                        //获取成品仓
                         if(whCodeMap.get("cVenDefine2")!=null){
                             String cWhCode=String.valueOf(whCodeMap.get("cVenDefine2"));//成品仓库
                             map.put("cWhCode",cWhCode);
@@ -357,9 +360,9 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
         BigDecimal iTaxPrice=getDecimalNew(String.valueOf(mapOMMODetails.get("iTaxPrice")));//原币含税单价
         BigDecimal iExchRate=getDecimalNew(String.valueOf(map.get("iExchRate")));//汇率
         BigDecimal unitPriceIncludingTax=iTaxPrice.multiply(iExchRate);//含税单价
-        itemMap.put("cBatchProperty1",unitPriceIncludingTax.doubleValue());//含税单价
-        itemMap.put("cBatchProperty8",map.get("cVenCode"));//供应商
-        itemMap.put("cBatchProperty9",map.get("cOrderCode"));//订单号
+        itemMap.put("cBatchProperty2",unitPriceIncludingTax.doubleValue());//含税单价
+        itemMap.put("cBatchProperty8",map.get("cOrderCode"));//订单号
+        itemMap.put("cBatchProperty9",map.get("cVenAbbName"));//供应商
         List<Map<String,Object>> listmap=this.baseMapper.getAA_BatchPropertyCount(itemMap);
         //判断是否查询到数据
         if(listmap!=null&&listmap.size()>0){
@@ -410,9 +413,9 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
 
     //获取批次属性赋值
     public void getcBatchProperty(Map<String,Object> itemMap,Map<String,Object> map){
-        itemMap.put("cBatchProperty1",map.get("cBatchProperty1"));//含税单价
-        itemMap.put("cBatchProperty8",map.get("cBatchProperty8"));//供应商
-        itemMap.put("cBatchProperty9",map.get("cBatchProperty9"));//订单号
+        itemMap.put("cBatchProperty2",map.get("cBatchProperty2"));//含税单价
+        itemMap.put("cBatchProperty8",map.get("cBatchProperty8"));//订单号
+        itemMap.put("cBatchProperty9",map.get("cBatchProperty9"));//供应商
     }
 
     public Object setNull(Object o){
@@ -562,7 +565,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                 }
                 vouchsMap.put("MoDetailsID",mapOMMODetails.get("MODetailsID"));//委外订单子表id
                 vouchsMap.put("invcode",mapOMMODetails.get("cInvCode"));//产品编码
-                vouchsMap.put("comcode",rdRecord01Map.get("cOrderCode"));//委外订单号
+                vouchsMap.put("comcode",rdRecords01List.get(0).get("downstreamOrderNumber"));//委外订单号
 //                vouchsMap.put("cDefine22",recordsMap.get("cDefine22"));//款号
                 vouchsMap.put("cTVBatch",recordsMap.get("cBatch"));//批号
                 vouchsMap.put("cInvCode",recordsMap.get("cInvCode"));//存货编码