#

luxiaotao1123

2021-03-11 2aa37a30dd1468c8c489273c99ffcb33c6dff737

#

 src/main/java/zy/cloud/wms/manager/entity/param/InitOrderParam.java

@@ -12,6 +12,8 @@

    private String number;

    private String customerTypeId;

    private List<PakinMatDto> list;

}

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

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
@@ -39,6 +40,8 @@
    private PakoutService pakoutService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private MatService matService;

    @Override
    @Transactional
@@ -213,7 +216,31 @@
    @Override
    @Transactional
    public R initOrder(InitOrderParam param, Long userId) {
        return null;
        Date now = new Date();
        for (PakinMatDto dto : param.getList()){
            Mat mat = matService.selectByMatnr(dto.getMatnr());
            if (mat == null) {
                continue;
            }
            CustOrder custOrder = new CustOrder(
                    param.getNumber(),    // 销售单号
                    DateUtils.convert(now),    // 单据日期[非空]
                    param.getCustomerTypeId(),    // 客户编号
                    null,    // 经手人编号[空]
                    dto.getMatnr(),    // 商品编号
                    dto.getCount(),    // 商品数量
                    Cools.isEmpty(mat.getName())?0.0D:Double.parseDouble(mat.getName()),    // 商品单价
                    null,    // 商品备注[空]
                    1,    // 状态
                    now,    // 添加时间
                    now,    // 修改时间
                    null    // 备注
            );
            if (!custOrderService.insert(custOrder)) {
                throw new CoolException("保存销售订单失败");
            }
        }
        return R.ok("生成销售订单" + param.getNumber() + "成功");
    }

}

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

@@ -144,7 +144,7 @@
                            success: function (res) {
                                if (res.code === 200){
                                    layer.closeAll();
                                    tableReload(false);
                                    $(".layui-laypage-btn")[0].click();
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {

 src/main/webapp/static/js/ioWorks/matQuery.js

@@ -43,20 +43,30 @@
                if (data.length === 0){
                    layer.msg('请添加物料');
                } else {
                    layer.open({
                        type: 1,
                        title: '定义销售单编号',
                        offset: '100px',
                        area: ['360px'],
                        shade: 0.1,
                        content: $('#getOrderNo'),
                        success: function(layero, index){
                            layer.iframeAuto(index)
                        },
                        cancel: function () {
                            $('#orderNo').val('');
                    var success = true;
                    for (var i=0;i<matData.length;i++) {
                        if (matData[i].count <= 0) {
                            layer.msg(matData[i].matnr + '物料数量必须大于零！', {icon: 2})
                            success = false;
                            return false;
                        }
                    });
                    }
                    if (success) {
                        layer.open({
                            type: 1,
                            title: '定义销售单编号',
                            offset: '100px',
                            area: ['360px'],
                            shade: 0.1,
                            content: $('#getOrderNo'),
                            success: function(layero, index){
                                layer.iframeAuto(index)
                            },
                            cancel: function () {
                                $('#orderNo').val('');
                            }
                        });
                    }
                }
                break;
        }
@@ -83,21 +93,26 @@
    form.on('submit(confirm)', function (data) {
        var matDetls = [];
        matData.forEach(function(elem) {
            matDetls.push({matnr: elem.matnr, count: elem.count});
            matDetls.push({matnr: elem.matnr
                , count: elem.count

            });
        });
        var req = JSON.stringify({
            number: data.field.orderNo
            , customerTypeId: '1'
            , list: matDetls
        })
        $.ajax({
            url: baseUrl+"/work/order/init",
            headers: {'token': localStorage.getItem('token')},
            data: JSON.stringify({
                number: data.field.orderNo,
                list: matDetls
            }),
            data: req,
            contentType:'application/json;charset=UTF-8',
            method: 'POST',
            success: function (res) {
                if (res.code === 200){
                    top.layui.layer.close(top.popupRight);
                    layer.msg(res.msg, {icon: 1});
                    top.layui.layer.close(top.popupRight);
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
@@ -105,7 +120,6 @@
                }
            }
        });

    })

    function updateMatData(locNo, matnr, count) {