Browse Source

入库单

chenchuang 2 năm trước cách đây
mục cha
commit
eab2c0c23a
17 tập tin đã thay đổi với 52 bổ sung41 xóa
  1. BIN
      jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/config/FeignConfig.class
  2. BIN
      jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.1.0.jar
  3. 10 10
      jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  4. BIN
      jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.1.0.jar
  5. 3 3
      jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  6. BIN
      jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.1.0.jar
  7. BIN
      jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.1.0.jar
  8. 14 14
      jeecg-boot-base/jeecg-boot-base-tools/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
  9. BIN
      jeecg-boot-module-demo/target/jeecg-boot-module-demo-3.1.0.jar
  10. 2 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/PurchaseWarehousingMapper.java
  11. 4 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/xml/PurchaseWarehousingMapper.xml
  12. 15 14
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.java
  13. BIN
      jeecg-boot-module-system/target/classes/org/jeecg/modules/openApi/mapper/PurchaseWarehousingMapper.class
  14. 4 0
      jeecg-boot-module-system/target/classes/org/jeecg/modules/openApi/mapper/xml/PurchaseWarehousingMapper.xml
  15. BIN
      jeecg-boot-module-system/target/classes/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.class
  16. BIN
      jeecg-boot-module-system/target/jeecg-boot-module-system-3.1.0.jar
  17. BIN
      jeecg-boot-module-system/target/jeecg-boot-module-system-3.1.0.jar.original

BIN
jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/classes/org/jeecg/config/FeignConfig.class


BIN
jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/jeecg-system-cloud-api-3.1.0.jar


+ 10 - 10
jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,10 +1,10 @@
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\fallback\SysBaseAPIFallback.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\IOnlineBaseExtAPI.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\fallback\BpmBaseExtAPIFallback.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\IBpmBaseExtAPI.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\factory\SysBaseAPIFallbackFactory.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\factory\OnlineBaseExtAPIFallbackFactory.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\fallback\OnlineBaseExtAPIFallback.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\config\FeignConfig.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\factory\BpmBaseExtAPIFallbackFactory.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\fallback\SysBaseAPIFallback.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\config\FeignConfig.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\IBpmBaseExtAPI.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\fallback\OnlineBaseExtAPIFallback.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\factory\OnlineBaseExtAPIFallbackFactory.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\factory\SysBaseAPIFallbackFactory.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\factory\BpmBaseExtAPIFallbackFactory.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\fallback\BpmBaseExtAPIFallback.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\IOnlineBaseExtAPI.java

BIN
jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/jeecg-system-local-api-3.1.0.jar


+ 3 - 3
jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,3 +1,3 @@
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\bpm\api\IBpmBaseExtAPI.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\online\api\IOnlineBaseExtAPI.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\bpm\api\IBpmBaseExtAPI.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\online\api\IOnlineBaseExtAPI.java

BIN
jeecg-boot-base/jeecg-boot-base-core/target/jeecg-boot-base-core-3.1.0.jar


BIN
jeecg-boot-base/jeecg-boot-base-tools/target/jeecg-boot-base-tools-3.1.0.jar


+ 14 - 14
jeecg-boot-base/jeecg-boot-base-tools/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,14 +1,14 @@
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\UserTokenContext.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\SpringContextHolder.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\annotation\RabbitComponent.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\config\RedisConfig.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\base\BaseMap.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\RedisUtil.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\CommonConfig.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\client\JeecgRedisClient.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\writer\JeecgRedisCacheWriter.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\listener\JeecgRedisListerer.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\TransmitUserTokenFilter.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\CacheConstant.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\GlobalConstants.java
-D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\receiver\RedisReceiver.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\annotation\RabbitComponent.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\UserTokenContext.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\base\BaseMap.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\GlobalConstants.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\client\JeecgRedisClient.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\RedisUtil.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\constant\CacheConstant.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\util\SpringContextHolder.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\writer\JeecgRedisCacheWriter.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\listener\JeecgRedisListerer.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\mqtoken\TransmitUserTokenFilter.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\config\CommonConfig.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\receiver\RedisReceiver.java
+D:\development-work\ideaWork\senyuDZ\jeecg-boot-base\jeecg-boot-base-tools\src\main\java\org\jeecg\common\modules\redis\config\RedisConfig.java

BIN
jeecg-boot-module-demo/target/jeecg-boot-module-demo-3.1.0.jar


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

@@ -233,4 +233,6 @@ public interface PurchaseWarehousingMapper extends BaseMapper<PurchaseWarehousin
      * @param map
      */
     void saveAA_BatchProperty(@Param("map")Map<String,Object> map);
+
+    Map<String,Object> getInventoryBycInvCode();
 }

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

@@ -651,4 +651,8 @@
             )
     </insert>
 
+    <select id="getInventoryBycInvCode" resultType="java.util.HashMap">
+        select *  from Inventory where cInvCode=#{cInvCode}
+    </select>
+
 </mapper>

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

@@ -186,6 +186,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                                             this.baseMapper.updateCurrentStock(itemMap);
                                         }
                                     }
+
                                     //新增AA_BatchProperty
                                     message=message+saveAA_BatchProperty(map,itemMap,mapPOPodetails);
 
@@ -255,20 +256,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("未能找到接收方信息");
+//                    }
+//                }
             }
         }
     }

BIN
jeecg-boot-module-system/target/classes/org/jeecg/modules/openApi/mapper/PurchaseWarehousingMapper.class


+ 4 - 0
jeecg-boot-module-system/target/classes/org/jeecg/modules/openApi/mapper/xml/PurchaseWarehousingMapper.xml

@@ -651,4 +651,8 @@
             )
     </insert>
 
+    <select id="getInventoryBycInvCode" resultType="java.util.HashMap">
+        select *  from Inventory where cInvCode=#{cInvCode}
+    </select>
+
 </mapper>

BIN
jeecg-boot-module-system/target/classes/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.class


BIN
jeecg-boot-module-system/target/jeecg-boot-module-system-3.1.0.jar


BIN
jeecg-boot-module-system/target/jeecg-boot-module-system-3.1.0.jar.original