调整

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);
+    String getMaxCode(@Param("code")String code,@Param("tableName")String tableName,@Param("dData")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">

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

@@ -93,7 +93,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
 
                 System.out.println(map.get("ID"));
                 //获取最大code
-                String cCode=oConvertUtils.addOne(this.baseMapper.getMaxCode("cCode","RdRecord01"));
+                String cCode=oConvertUtils.addOne(this.baseMapper.getMaxCode("cCode","RdRecord01","dDate"));
 
                 if(cCode!=null){
                     map.put("cCode",cCode);
@@ -304,20 +304,20 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                 this.baseMapper.saveRdRecord01One(map);
                 //调拨单
                 //判断接收方是否有只值 宁波森语 马菲羊 森语集团
-//                if(map.get("cVenCodeReceiver")!=null&&!String.valueOf(map.get("cVenCodeReceiver")).equals("")){
-//                    //根据接收方获取供应商信息
-//                    Map<String,Object> mapVenCode= this.baseMapper.getWhCodeByVenCode(String.valueOf(map.get("cVenCodeReceiver")));
-//                    if(mapVenCode!=null){
-//                        String cVenAbbName=String.valueOf(mapVenCode.get("cVenAbbName"));//供应商简称
-//                        //判断是否外部供应商  外部则进入下一波做调拨单 非则不做
-//                        if(!cVenAbbName.equals("宁波森语")&&!cVenAbbName.equals("马菲羊")&&!cVenAbbName.equals("森语集团")){
-//                            //保存调拨单
-//                            saveTransVouch(map,itemList);
-//                        }
-//                    }else{
-//                        throw new RuntimeException("未能找到接收方信息");
-//                    }
-//                }
+                if(map.get("cVenCodeReceiver")!=null&&!String.valueOf(map.get("cVenCodeReceiver")).equals("")){
+                    //根据接收方获取供应商信息
+                    Map<String,Object> mapVenCode= this.baseMapper.getWhCodeByVenCode(String.valueOf(map.get("cVenCodeReceiver")));
+                    if(mapVenCode!=null){
+                        String cVenAbbName=String.valueOf(mapVenCode.get("cVenAbbName"));//供应商简称
+                        //判断是否外部供应商  外部则进入下一波做调拨单 非则不做
+                        if(!cVenAbbName.equals("宁波森语")&&!cVenAbbName.equals("马菲羊")&&!cVenAbbName.equals("森语集团")){
+                            //保存调拨单
+                            saveTransVouch(map,itemList);
+                        }
+                    }else{
+                        throw new RuntimeException("未能找到接收方信息");
+                    }
+                }
             }
         }
     }
@@ -501,7 +501,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
         //获取主表最大ID
         transVouchMao.put("ID",oConvertUtils.addOne(getMaxId("ID","TransVouch")));
         //获取最大编码
-        transVouchMao.put("cTVCode",oConvertUtils.addOne(getMaxId("cTVCode","TransVouch")));
+        transVouchMao.put("cTVCode",oConvertUtils.addOne(this.baseMapper.getMaxCode("cTVCode","TransVouch","dTVDate")));
         //修改最大编码
         this.baseMapper.updateVoucherHistoryCNumber(oConvertUtils.maxNumber(String.valueOf(transVouchMao.get("cTVCode"))),"0304");
         //单据日期
@@ -510,8 +510,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
         transVouchMao.put("dTVDate",formatter.format(date));
         //转出部门
         transVouchMao.put("cODepCode","");
-        //转入部门
-        transVouchMao.put("cIDepCode",rdRecord01Map.get("cDepCode"));
+
         //转出仓库
         transVouchMao.put("cOWhCode",rdRecord01Map.get("cWhCode"));
         //转入仓库??
@@ -541,6 +540,8 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
         if(OM_MOmainMap==null){
             throw new RuntimeException("未找到下游订单");
         }
+        //转入部门
+        transVouchMao.put("cIDepCode",OM_MOmainMap.get("cDepCode"));
         //订单号
         transVouchMao.put("cMPoCode",rdRecords01List.get(0).get("downstreamOrderNumber"));//1
         transVouchMao.put("cDefine13",rdRecords01List.get(0).get("downstreamOrderNumber"));//1