#

luxiaotao1123

2021-03-13 b55b2670e438ec149791c03627926c6825372825

#

 src/main/java/zy/cloud/wms/manager/entity/CustOrder.java

@@ -69,7 +69,7 @@
    /**
     * 状态 1: 待处理  2: 已完成  3: 取消  4: 异常  
     */
    @ApiModelProperty(value= "状态 0: 载入中 1: 待处理  2: 已完成  3: 取消  4: 异常  ")
    @ApiModelProperty(value= "状态 0: 载入中 1: 待处理  2: 未拣货  3: 取消  4: 已完成  ")
    private Integer status;

    /**
@@ -200,11 +200,11 @@
            case 1:
                return "待处理";
            case 2:
                return "已完成";
                return "未拣货";
            case 3:
                return "取消";
            case 4:
                return "异常";
                return "已完成";
            default:
                return String.valueOf(this.status);
        }

 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java

@@ -129,7 +129,10 @@
            return R.error("保存数据失败");
        }
        // todo：修改库存数量

        // 修改单据状态
        if (!custOrderService.updateStatus(param.getNumber(), 4)) {
            throw new CoolException("修改单据状态失败");
        }
        return R.ok();
    }

@@ -173,10 +176,27 @@
    }

    @Override
    @Transactional
    public R completePakout(String wrkNo, Long userId) {
        Pakout pakout = pakoutService.selectOne(new EntityWrapper<Pakout>().eq("wrk_no", wrkNo));
        if (null != pakout) {
            if (pakoutService.stockOutComplete(wrkNo, null, userId)) {

                boolean complete = true;
                List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", pakout.getDocNum()));
                for (Pakout item : pakouts) {
                    if (item.getWrkSts() != 3) {
                        complete = false;
                        break;
                    }
                }
                if (complete) {
                    // 修改单据状态
                    if (!custOrderService.updateStatus(pakout.getDocNum(), 4)) {
                        throw new CoolException("修改单据状态失败");
                    }
                }

                return R.ok("拣货单已完成");
            }
        }
@@ -210,6 +230,15 @@
        if (!pakoutService.delete(new EntityWrapper<Pakout>().eq("wrk_no", pakout.getWrkNo()))) {
            throw new CoolException("删除拣货单失败");
        }

        // 取消销售订单
        List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", pakout.getDocNum()));
        if (Cools.isEmpty(pakouts)){
            // 修改单据状态
            if (!custOrderService.updateStatus(pakout.getDocNum(), 3)) {
                throw new CoolException("修改单据状态失败");
            }
        }
        return R.ok("拣货单已取消");
    }


 src/main/webapp/views/custOrder/custOrder.html

@@ -29,8 +29,9 @@
            <select name="status">
                <option value="" style="display: none">选择状态</option>
                <option value="1">待处理</option>
                <option value="2">已完成</option>
                <option value="2">未拣货</option>
                <option value="3">取消</option>
                <option value="3">已完成</option>
            </select>
        </div>
    </div>
@@ -68,9 +69,11 @@
          {{# if( d.status === 1){ }}
          class="layui-badge layui-badge-blue"
          {{# } else if(d.status === 2){ }}
          class="layui-badge layui-badge-green"
          {{# } else if(d.status === 3){ }}
          class="layui-badge layui-badge-red"
          {{# } else if(d.status === 3){ }}
          class="layui-badge layui-badge-gray"
          {{# } else if(d.status === 4){ }}
          class="layui-badge layui-badge-green"
          {{# } }}
    >{{d.status$}}</span>
</script>