孚能

野心家

2023-06-20 5ce6bfb2e237b9fbf092a03cf80e86d928ac7ca6

孚能

 src/main/java/com/zy/asrs/controller/LocMastController.java

@@ -82,7 +82,7 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("loc_type2")){
                if (entry.getKey().equals("loc_type1")){
                    wrapper.eq(entry.getKey(), val);
                }else {
                    wrapper.like(entry.getKey(), val);

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

@@ -150,7 +150,7 @@
    @TableField("error_memo")
    private String errorMemo;

    @ApiModelProperty(value= "")
    @ApiModelProperty(value= "是否启动1，0")
    @TableField("ctn_kind")
    private Integer ctnKind;


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

@@ -377,20 +377,20 @@
                        }

                    }else {
                        //测试库位转静置库位
                        //测试库位转静置库位和NG库位
                        if (locMast.getLocType1().equals((short)4)){
                            locMast.setPackStatus(4); //4:NG
                        }else {
                            locMast.setPackStatus(5); //5:静置中
                        }
                        sign=true;
                        if (locMast.getLocType1()==2 && sourceLoc.getLocType1()==1){
                            TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                                    .eq("loc_no",sourceLoc.getLocNo())
                                    .eq("barcode",locDetl.getMatnr())
                                    .eq("status",4)
                            );
                            testMast.setStatus(5);
                            testMast.setLocNo(locMast.getLocNo());
                            testMast.setModiTime(new Date());
                            if (!testMastService.update(testMast,new EntityWrapper<TestMast>()
                                    .eq("loc_no",sourceLoc.getLocNo())
@@ -398,7 +398,7 @@
                                    .eq("status",4))){
                                throw new CoolException("更改测试状态失败");
                            }
                        }

                    }
                    if (!locMastService.updateById(locMast)) {
//                        exceptionHandle("库位移转 ===>> 修改目标库位状态失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
@@ -510,8 +510,19 @@
                                combParam.setPackSts(1);//OK
                                combParam.setStepSts(7);//测试库出库完成
                            }else if(wrkMast.getStaNo()==204){//NG 出库
                                //NG出库修改测试档的状态为5.已移库
                                TestMast testMast=testMastService.selectOne(new EntityWrapper<TestMast>()
                                        .eq("user_id",wrkMast.getBarcode())
                                        .eq("barcode",wrkDetls101.get(0).getMatnr()));
                                combParam.setPackSts(2);//NG
                                combParam.setStepSts(8);//NG出库完成
                                testMast.setStatus(5);
                                if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
                                        .eq("user_id",wrkMast.getBarcode())
                                        .eq("barcode",wrkDetls101.get(0).getMatnr()))){
                                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                    return FAIL.setMsg("全板出库 ===>> 修改测试表状态为5失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                                }
                            }else if(wrkMast.getStaNo()==103){//目标站103出库
                                combParam.setPackSts(1);//OK
                                combParam.setStepSts(6);//静置库出库完成

 src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: 8081
  port: 8080
  servlet:
    context-path: /@pom.build.finalName@
#  tomcat:
@@ -12,7 +12,7 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=zjfnasrs
    url: jdbc:sqlserver://10.12.55.200:1433;databasename=zjfnasrs
    username: sa
    password: sa@123
  mvc:

 src/main/webapp/static/js/locMast/locMast.js

@@ -46,7 +46,7 @@
            // ,{field: 'outEnable', align: 'center',title: ''}
            // ,{field: 'ioTime$', align: 'center',title: ''}
            // ,{field: 'firstTime$', align: 'center',title: ''}
            ,{field: 'modiUser$', align: 'center',title: '修改人员', hide:true}
            ,{field: 'ctnKind', align: 'center',title: '启动按钮'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true}
            // ,{field: 'appeUser$', align: 'center',title: '创建者',event: 'appeUser', style: 'text-decoration: underline;cursor:pointer'}
            // ,{field: 'appeTime$', align: 'center',title: '添加时间'}

 src/main/webapp/static/js/stoMan/stoQue.js

@@ -45,7 +45,7 @@
            //         return html;
            //     },width:80}
            ,{field: 'barcode', align: 'center',title: '托盘码'}
            ,{field: 'modiUser$', align: 'center',title: '修改人员'}
            ,{field: 'ctnKind', align: 'center',title: '启动按钮'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', width: 180}
            ,{ fixed: 'right', title:'操作', align: 'center', toolbar: '#operate'}
        ]],

 src/main/webapp/views/stoMan/stoQue.html

@@ -61,16 +61,13 @@
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <select name="loc_type2" id="loc_type2" class="layui-input" type="text" placeholder="设备号" autocomplete="off">
            <select name="loc_type1" id="loc_type1" class="layui-input" type="text" placeholder="库位类型" autocomplete="off">
                <!--                    <option style="display: none"></option>-->
                <option value="">设备号</option>
                <option value="0">静置库位</option>
                <option value="1">1号</option>
                <option value="2">2号</option>
                <option value="3">3号</option>
                <option value="4">4号</option>
                <option value="5">5号</option>
                <option value="6">6号</option>
                <option value="">库位类型</option>
                <option value="1">测试库位</option>
                <option value="2">静置库位</option>
                <option value="3">暂存库位</option>
                <option value="4">NG库位</option>
            </select>
        </div>
    </div>