实盘登记

xqs
1 parent a147e979
Showing 5 changed files with 30 additions and 8 deletions
README.md
src/main/java/com/huaheng/HuaHengServletInitializer.java
src/main/java/com/huaheng/pc/inventory/adjustHeader/service/AdjustHeaderServiceImpl.java
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/service/CycleCountDetailServiceImpl.java
src/main/resources/templates/inventory/cycleCountDetail/cycleCountDetail.html
     版本说明
    WMS_v2  
-   1. 入库
-        单据新建-0  
-   
+ 
+     /***
+      * 1.差异单页面
+      * 盘点有差异之后生成差异单，差异单不做操作，展示，和生成调整单
+      *
+      * 2.实盘登记页面，
+      * 做到盘点任务明细后面，
+      * 当员工确定容器，扫码物料，弹出选中已经生成的任务进行盘点登记，
+      * 可以扫码容器选中任务
+      * 新增盘有按钮，可以新增一条盘点明细
+      *
+      *
+      * 3.配置
+      * 根据  容器多选，库位多选，巷道，物料多选，库存时间段，呆滞时间
+      * 根据配置条件自动生成盘点单
+      * 在盘点单下发任务时，重新查询库存，同步变更库存物料数量
+      * 给一个自动生成盘点单按钮，定时扫描是否开启
+      *
+      *
+      * 4.下发任务至WCS时做校验，是否同库位同容器已经有任务在执行
+      *
+      * */
  
 \ No newline at end of file
@@ -34,7 +34,7 @@ public class HuaHengServletInitializer extends SpringBootServletInitializer
  
     public static void main(String[] args)
     {
-        SpringApplication.run(HuaHengApplication.class, args);
+        //SpringApplication.run(HuaHengServletInitializer.class, args);
         System.out.println("***************  华恒WMS启动成功WAR  ***************\n" +
                 " >>>     WMS_Servlet启动成功!     <<<  \n"+
                 "　　   へ　　　　 ／|▓\n"+
@@ -97,11 +97,14 @@ public class AdjustHeaderServiceImpl extends ServiceImpl&lt;AdjustHeaderMapper, Adj
                 throw new SecurityException("选择单据类型为质检调整时，质检单编码不能为空！");
             }
                 break;
-            case "adjust":   //盘点调整
+            case "cyclecountAdjust":   //盘点调整
                 if(StringUtils.isEmpty(adjustHeader.getCycleCountCode())){
                     throw new SecurityException("选择单据类型为盘点调整时，盘点单编码不能为空！");
                 }
                 break;
+            //除质检和调整需要前置单据，其他不需要
+            default:
+                break;
         }
  
         adjustHeader.setCreated(new Date());
@@ -358,12 +358,12 @@ public class CycleCountDetailServiceImpl extends ServiceImpl&lt;CycleCountDetailMap
         LambdaQueryWrapper<CycleCountHeader> cycleCountHeaderLambdaQueryWrapper = Wrappers.lambdaQuery(cycleCountHeader);
          cycleCountHeader = cycleCountHeaderService.getOne(cycleCountHeaderLambdaQueryWrapper); //主单
         //任务执行后再实盘登记
-        if(cyclecountDetail.getEnableStatus() < QuantityConstant.CYCLECOUNT_STATUS_EXECUTING){
+        /*if(cyclecountDetail.getEnableStatus() < QuantityConstant.CYCLECOUNT_STATUS_EXECUTING){
             return AjaxResult.error("盘点任务未执行不能登记数量！");
         }
         if(cyclecountDetail.getEnableStatus() == QuantityConstant.CYCLECOUNT_STATUS_COMPLETED){
             return AjaxResult.error("盘点任务完成后不能再登记数量！");
-        }
+        }*/
         if(cycleCountHeader == null){
             return AjaxResult.error("主单据不存在");
         }
@@ -322,7 +322,7 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                            if(row.enableStatus >= 10 && row.enableStatus < 100){
+                            if(row.enableStatus >= 1 && row.enableStatus < 110){
                                 actions.push('<a class="btn btn-success btn-xs ' + confirmFlag + '" href="#" onclick="confirmGapQty(\'' + row.id + '\')"><i class="fa fa-comment"></i>实盘登记</a> ');
                             }
                             if(row.enableStatus  === 1 ){