#

luxiaotao1123

2021-03-22 48a24a2dd7752e92880a05e620875e360ef812c9

#

 src/main/java/zy/cloud/wms/common/service/MainService.java

@@ -11,9 +11,11 @@
import zy.cloud.wms.common.model.OrderStoDto;
import zy.cloud.wms.common.service.asrs.AsrsService;
import zy.cloud.wms.common.service.asrs.entity.Result;
import zy.cloud.wms.common.service.asrs.entity.Result1;
import zy.cloud.wms.common.utils.VersionUtils;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.entity.param.StockTransferParam;
import zy.cloud.wms.manager.entity.result.PakoutVo;
import zy.cloud.wms.manager.service.CustOrderService;
import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.MatService;
@@ -109,9 +111,51 @@
        if (Cools.isEmpty(dto) || Cools.isEmpty(dto.getCustOrders())) {
            return;
        }
        // 检查库存是否足够
        locDetlService.checkLocDetlCount(dto.getNumber());
        Date now = new Date();
        // 检查库存是否足够
        List<StockTransferParam> transferParams = locDetlService.checkLocDetlCountOfRes(dto.getNumber());
        if (!Cools.isEmpty(transferParams)) {

//            // 查看立库库存
            Result1 result = asrsService.stockTransfer(transferParams);
            if (result.getCode() == 500) {
                if (Cools.isEmpty(result.getData())) {
                    throw new CodeCoolException(result.getMsg());
                } else {
                    throw new CodeCoolException("20001-" + String.valueOf(result.getData()));
                }

            }
            if (result.getCode() == 200) {
                List<PakoutVo> res = (List<PakoutVo>) result.getData();
                for (PakoutVo vo : res) {
                    // 判断物料是否存在
                    Mat mat = matService.selectByMatnr(vo.getMatnr());
                    if (null == mat) {
                        throw new CoolException(vo.getMatnr() + "物料尚未更新。" + dto.getNumber() +"单据因此中断！");
                    }
                    Pakout pakout = new Pakout();
                    pakout.setWrkSts(1L);
                    pakout.setAnfme(vo.getAnfme());
                    pakout.setZpallet(vo.getZpallet());
                    pakout.setLocNo(vo.getLocNo());
                    pakout.setNodeId(-1L);
                    pakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
                    VersionUtils.setPakout(pakout, mat);
//                    pakout.setDocId(custOrder.getBTypeId());
                    pakout.setDocNum(dto.getNumber());    // 单据编号
                    pakout.setCreateTime(now);
                    pakout.setUpdateTime(now);
                    pakout.setStatus(1);
                    if (!pakoutService.insert(pakout)) {
                        throw new CoolException("保存出库通知单失败");
                    }
                }

            }
        }
//        // 检查库存是否足够
//        locDetlService.checkLocDetlCount(dto.getNumber());
        for (CustOrder custOrder : dto.getCustOrders()) {
            // 判断物料是否存在
            Mat mat = matService.selectByMatnr(custOrder.getUserCode());

 src/main/java/zy/cloud/wms/common/service/asrs/AsrsService.java

@@ -4,6 +4,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import zy.cloud.wms.common.service.asrs.entity.Result;
import zy.cloud.wms.common.service.asrs.entity.Result1;
import zy.cloud.wms.manager.entity.param.StockTransferParam;
import zy.cloud.wms.manager.utils.HttpHandler;

@@ -34,7 +35,7 @@
        }
    }

    public Boolean stockTransfer(List<StockTransferParam> params) {
    public Result1 stockTransfer(List<StockTransferParam> params) {
        try {
            String response = new HttpHandler.Builder()
                    .setUri(asrsBaseUrl)
@@ -42,15 +43,10 @@
                    .setJson(JSON.toJSONString(params))
                    .build()
                    .doPost();
            Result result = JSON.parseObject(response, Result.class);
            if (result.getCode() == 200) {
                return true;
            } else {
                return false;
            }
            return JSON.parseObject(response, Result1.class);
        } catch (IOException e) {
            e.printStackTrace();
            return false;
            return new Result1(500, "服务器异常", null);
        }
    }


 src/main/java/zy/cloud/wms/common/service/asrs/entity/Result1.java

New file
@@ -0,0 +1,28 @@
package zy.cloud.wms.common.service.asrs.entity;

import lombok.Data;
import zy.cloud.wms.manager.entity.result.PakoutVo;

import java.util.List;

/**
 * Created by vincent on 2021/3/20
 */
@Data
public class Result1 {

    private Integer code;

    private String msg;

    private List<PakoutVo> data;

    public Result1() {
    }

    public Result1(Integer code, String msg, List<PakoutVo> data) {
        this.code = code;
        this.msg = msg;
        this.data = data;
    }
}

 src/main/java/zy/cloud/wms/manager/entity/result/PakoutVo.java

New file
@@ -0,0 +1,19 @@
package zy.cloud.wms.manager.entity.result;

import lombok.Data;

/**
 * Created by vincent on 2021/3/22
 */
@Data
public class PakoutVo {

    private String locNo;

    private String matnr;

    private Double anfme;

    private String zpallet;

}

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

@@ -352,17 +352,17 @@
            }
        }
        if (asrs) {
            if (asrsService.stockTransfer(params)) {
                for (StockTransferParam param : params) {
                    // 修改销售订单待出数量
                    if (!custOrderService.updateQty(number, param.getMatnr(), param.getAnfme())) {
                        throw new CoolException("修改销售订单待出数量失败");
                    }
                }
                return R.ok("库存调拨成功");
            } else {
                return R.error("立库调拨失败，请联系管理员");
            }
//            if (asrsService.stockTransfer(params)) {
//                for (StockTransferParam param : params) {
//                    // 修改销售订单待出数量
//                    if (!custOrderService.updateQty(number, param.getMatnr(), param.getAnfme())) {
//                        throw new CoolException("修改销售订单待出数量失败");
//                    }
//                }
//                return R.ok("库存调拨成功");
//            } else {
//                return R.error("立库调拨失败，请联系管理员");
//            }
        }
        return R.error("暂不缺货，不需要立库调拨");
    }

 src/main/webapp/static/js/custOrder/custOrder.js

@@ -321,7 +321,7 @@
                    } else if (res.code === 403){
                        top.location.href = baseUrl+"/";
                    } else {
                        layer.msg(res.msg)
                        layer.msg(res.msg, {icon: 2})
                    }
                    $(".layui-laypage-btn")[0].click();
                }

 src/main/webapp/static/js/pakout/pakout.js

@@ -229,7 +229,9 @@
            // 完成
            case 'complete':
                layer.confirm('确认完成该笔拣货单？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    var loadIndex = layer.load(2);
                    http.post(baseUrl+"/work/hand/control/pakout", {wrkNo: data.wrkNo, type:1}, function (res) {
                        layer.close(loadIndex);
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(data.wrkNo + res.msg);
                    })
@@ -240,7 +242,9 @@
            // 取消
            case 'cancel':
                layer.confirm('确认取消该笔拣货单？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){
                    var loadIndex = layer.load(2);
                    http.post(baseUrl+"/work/hand/control/pakout", {wrkNo: data.wrkNo, type:2}, function (res) {
                        layer.close(loadIndex);
                        $(".layui-laypage-btn")[0].click();
                        layer.msg(data.wrkNo + res.msg);
                    })

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

@@ -91,7 +91,7 @@
          {{# if( d.type === 1){ }}
          class="layui-badge layui-badge-blue" ><span style="display: none">{{d.number}}</span>平仓</span>
          {{# } else if(d.type === 2){ }}
          class="layui-badge layui-badge-red" ><span style="display: none">{{d.number}}</span>立库</span>
          class="layui-badge layui-badge-green" ><span style="display: none">{{d.number}}</span>立库</span>
          {{# } }}
</script>