#

zwl

昨天 7102e9faca7b1cc6da94be325831c13d0301d7f6

#

 src/main/java/com/zy/asrs/entity/OrderDetl.java

@@ -116,9 +116,9 @@
    private String color;

    /**
     * 品牌
     * 仓库
     */
    @ApiModelProperty(value= "品牌")
    @ApiModelProperty(value= "仓库")
    private String brand;

    /**

 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java

@@ -95,6 +95,8 @@
    private ExdStockService exdStockService;
    @Autowired
    private ExdInstockSourceService  exdInstockSourceService;
    @Autowired
    private Order1Service order1Service;


    @Override
@@ -130,9 +132,6 @@
        //进行批号筛选，批号只能唯一
        Set<String> batchs = new HashSet<>();
        List<String> strings = new ArrayList<>();
        long time = new Date().getTime();
        //生产入库对一坨物料进行绑定。唯一值
        String fbillno = param.getBarcode()+"--"+time;
        for (CombParam.CombMat mat : param.getCombMats()) {
            if (Cools.isEmpty(mat.getBatch())) {
                continue;
@@ -197,9 +196,10 @@
                waitPakin.setModiUser(userId);
                waitPakin.setColor(userId+"");
                waitPakin.setModiTime(now);
                //生产入库对一坨物料进行绑定。唯一值
                waitPakin.setOrigin(fbillno);

                ExdvYanbu barcode1 = exdMaterialMapper.getBacode(detlDto.getBc());
                //生产入库对一坨物料进行绑定。唯一值
                waitPakin.setOrigin(param.getBarcode()+"-"+barcode1.getIcmono()+"-"+now.getTime());
                String pid="03.98";
                if(!Cools.isEmpty(barcode1)&&!Cools.isEmpty(barcode1.getProdinkind())){
                    pid=barcode1.getProdinkind();
@@ -251,8 +251,10 @@
                if (!orderDetlService.increaseWorkQty2(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(), userId)) {
                    throw new CoolException("修改单据作业数量失败");
                }

                Order1 order1 = order1Service.selectByNo(param.getOrderNo());
                // 修改子单订单作业数量
                if (!orderDetl1Service.increaseWorkQty2(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(), userId)) {
                if (!orderDetl1Service.increaseWorkQty2(order1.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(), userId)) {
                    throw new CoolException("修改单据作业数量失败");
                }


 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -92,7 +92,7 @@
                exdInstockTarge.setFtrantype(decType);
                exdInstockTarge.setFdate(order.getUpdateTime());
                Integer frob = 1;
                if(order.getDocType().intValue()==21||order.getDocType().intValue()==24||order.getDocType().intValue()==2||order.getDocType().intValue()==3){
                if(order.getDocType().intValue()==21||order.getDocType().intValue()==24){
                    frob = -1;
                }
                exdInstockTarge.setFrob(frob);
@@ -103,7 +103,10 @@
                exdInstockTarge.setWritor("WMS");
                exdInstockTarge.setStatus(0);
                exdInstockTarge.setProdinkind(orderDetl.getItemNum());
                exdInstockTargetService.insert(exdInstockTarge);
                if(exdInstockTargetService.insert(exdInstockTarge)){
                    log.info("入库订单完成插入中间表，数据={}",exdInstockTarge);
                    break;
                }
            }
            if (!orderService.updateSettle(order.getId(), 6L, null)) {
                throw new CoolException("服务器内部错误，请联系管理员");
@@ -119,11 +122,19 @@
                exdOutstockTarget.setFbillno(orderDetl.getOrderNo());
                if (order.getDocType() == 42) {
                    exdOutstockTarget.setFtrantype(41);
                } else if(order.getDocType() == 3){
                    exdOutstockTarget.setFtrantype(1);
                }else if(order.getDocType() == 25){
                    exdOutstockTarget.setFtrantype(24);
                } else {
                    exdOutstockTarget.setFtrantype(order.getDocType().intValue());
                }
                exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
                exdOutstockTarget.setFrob(order.getDocType().intValue()==2? -1:1);
                Integer frob = 1;
                if (order.getDocType().intValue()==2 || order.getDocType().intValue()==3){
                    frob = -1;
                }
                exdOutstockTarget.setFrob(frob);
                //操作用户
                User id = userService.selectOne(new EntityWrapper<User>().eq("id", orderDetl.getUpdateBy()));
                exdOutstockTarget.setFuserid(Integer.valueOf(id.getEmail()));
@@ -131,8 +142,10 @@
                exdOutstockTarget.setWritor("WMS");
                exdOutstockTarget.setStatus(0);
                exdOutstockTarget.setProdinkind(orderDetl.getItemNum());
                exdOutstockTargetService.insert(exdOutstockTarget);

                if(exdOutstockTargetService.insert(exdOutstockTarget)){
                    log.info("出库订单完成插入中间表，数据={}",exdOutstockTarget);
                    break;
                }
            }
            if (!orderService.updateSettle(order.getId(), 6L, null)) {
                throw new CoolException("服务器内部错误，请联系管理员");
@@ -234,7 +247,7 @@
            //仓库ID
            Integer Fdcstockid = 19382;
            if(!Cools.isEmpty(bacode.getProdinkind())){
                ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", orderDetl.getBrand()));
                ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fnumber", bacode.getProdinkind()));
                Fdcstockid = Integer.valueOf(fname.getId());
            }
            exdOutstockTarget.setFdcstockid(Fdcstockid);

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -24,6 +24,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;

import java.util.Date;
import java.util.HashMap;
import java.util.List;

/**
@@ -540,8 +541,19 @@
    private void write(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
        ExdInstockTarget exdInstockTarge;
        int i = 1;
        //计数
        HashMap<String,Integer> hashMap = new HashMap<>();
        for (WrkDetl wrkDetl : wrkDetls) {
            if (Cools.isEmpty(wrkDetl.getOrderNo()) && !Cools.isEmpty(wrkDetl.getInspect()) && wrkDetl.getInspect() == 1) {
                if (Cools.isEmpty(hashMap)){
                    hashMap.put(wrkDetl.getOrigin(),1);
                }else{
                    if(hashMap.containsKey(wrkDetl.getOrigin())){
                        hashMap.put(wrkDetl.getOrigin(),hashMap.get(wrkDetl.getOrigin())+1);
                    }else{
                        hashMap.put(wrkDetl.getOrigin(),1);
                    }
                }
                ExdvYanbu bacode = exdMaterialMapper.getBacode(wrkDetl.getThreeCode());
                if (bacode == null) {
                    log.info("验布数据没有，{}", wrkDetl.getThreeCode());
@@ -559,7 +571,7 @@
                exdInstockTarge.setFbillerid(Integer.valueOf(id.getEmail()));
                exdInstockTarge.setFfmanagerid(17938);
                exdInstockTarge.setFsmanagerid(17938);
                exdInstockTarge.setFentryid(i);
                exdInstockTarge.setFentryid(hashMap.get(wrkDetl.getOrigin()));
                //物料ID
                Mat mat = matServiceImpl.selectByMatnr(wrkDetl.getMatnr());
                exdInstockTarge.setFitemid(Integer.valueOf(mat.getUuid()));

 src/main/java/com/zy/third/entity/ExdInstockSource.java

@@ -177,8 +177,7 @@
     * 
     */
    private String readormsg;

    private String ProdInKind;
    private String prodinkind;

    @TableField(exist = false)
    private static final long serialVersionUID = 1L;

 src/main/java/com/zy/third/task/handler/OrderHandler.java

@@ -117,7 +117,7 @@

        //生成子单主表
        Order1 order1 = new Order1(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                String.valueOf(order.getUuid()),    // 编号[非空]
                fbillno,    // 订单编号
                DateUtils.convert(exdInstockSource.get(0).getFdate()),    // 单据日期
                docType.getDocId(),    // 单据类型

 src/main/resources/application.yml

@@ -11,7 +11,7 @@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    #jdbc-url: jdbc:sqlserver://172.17.3.20:1433;databasename=ycawdasrs
    jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
    jdbc-url: jdbc:sqlserver://172.17.3.18:1433;databasename=ycawdasrs
    username: sa
    password: sa@123
  mvc:

 src/main/resources/license.lic

Binary files differ

 src/main/resources/mapper/asrs/Order1Mapper.xml

@@ -54,7 +54,7 @@
    </update>

    <select id="selectComplete" resultMap="BaseResultMap">
        select top 5 *
        select *
        from man_order1
        where 1=1
        and settle = 4

 src/main/resources/mapper/asrs/OrderMapper.xml

@@ -54,7 +54,7 @@
    </update>

    <select id="selectComplete" resultMap="BaseResultMap">
        select top 5 *
        select *
        from man_order
        where 1=1
        and settle = 4

 src/main/resources/mapper/third/ExdInstockSourceMapper.xml

@@ -37,6 +37,7 @@
            <result property="reador" column="Reador" />
            <result property="writormsg" column="WritorMsg" />
            <result property="readormsg" column="ReadorMsg" />
            <result property="prodinkind" column="ProdInKind" />
    </resultMap>

    <sql id="Base_Column_List">

 src/main/webapp/static/js/orderTablenotxs.js

@@ -64,7 +64,7 @@
    });

    /* 表格搜索 */
    form.on('submit(originTableSearch)', function (data) {
    form.on('submit(originTablenotxsSearch)', function (data) {
        insTb.reload({where: data.field});
        return false;
    });

 src/main/webapp/static/js/wrkMast/wrkMast.js

@@ -30,7 +30,7 @@
            ,{field: 'staNo$', align: 'center',title: '目标站'}
            ,{field: 'sourceLocNo$', align: 'center',title: '源库位'}
            ,{field: 'locNo$', align: 'center',title: '目标库位'}
            ,{field: 'pauseMk', align: 'center',title: '订单号'}
            ,{field: 'packed', align: 'center',title: '订单号'}
            ,{field: 'barcode', align: 'center',title: '条码'}
            ,{field: 'preHave', align: 'center',title: '先入品', hide: true}
            ,{field: 'takeNone', align: 'center',title: '空操作', hide: true}

 src/main/webapp/static/js/wrkMastLog/wrkMastLog.js

@@ -33,6 +33,7 @@
            ,{field: 'staNo$', align: 'center',title: '目标站'}
            ,{field: 'sourceLocNo$', align: 'center',title: '源库位'}
            ,{field: 'locNo$', align: 'center',title: '目标库位'}
            ,{field: 'packed', align: 'center',title: '订单号'}
            // ,{field: 'picking', align: 'center',title: '拣料', templet:function(row){
            //         var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
            //         if(row.picking === 'Y'){html += " checked ";}
@@ -60,7 +61,6 @@
            // ,{field: 'appeUser$', align: 'center',title: '创建者',event: 'appeUser', style: 'cursor:pointer'}
            // ,{field: 'appeTime$', align: 'center',title: '添加时间'}
            ,{field: 'barcode', align: 'center',title: '条码'}
            ,{field: 'pauseMk', align: 'center',title: '订单号'}
            // ,{field: 'fullPlt', align: 'center',title: '满板', templet:function(row){
            //         var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
            //         if(row.fullPlt === 'Y'){html += " checked ";}

 src/main/webapp/views/wrkMast/wrkMast.html

@@ -75,7 +75,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="pause_mk" placeholder="订单号" autocomplete="off">
            <input class="layui-input" type="text" name="packed" placeholder="订单号" autocomplete="off">
        </div>
    </div>
    <!-- 日期范围 -->

 src/main/webapp/views/wrkMastLog/wrkMastLog.html

@@ -59,7 +59,7 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="pause_mk" placeholder="订单号" autocomplete="off">
            <input class="layui-input" type="text" name="packed" placeholder="订单号" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">