#lsh

18516761980

2022-10-10 113756e1bfdb3de594b46d5676e3a7fff01499f7

#lsh

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

@@ -343,7 +343,8 @@
//    @ManagerAuth(memo = "暂停测试")
    @ResponseBody
    public synchronized R suspendTestPACK(@RequestBody SearchLocParam param) {
        mobileService.suspendTestPACK();  //请求暂停测试

        mobileService.suspendTestPACK(param.getBarcode());  //请求暂停测试
        return R.ok();
    }
    /*...........................赣州新增..............以上.............赣州新增...........................*/

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

@@ -210,6 +210,7 @@
    public synchronized R hostName(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) HeartBeat param,
                                   HttpServletRequest request){
        appkey="ea1f0459efc02a79f046f982767939ae";
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -227,7 +228,6 @@
    public synchronized R combPack(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) CombParam param,
                                   HttpServletRequest request){

        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -262,7 +262,7 @@
    public synchronized R infoReview(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) Review param,
                                   HttpServletRequest request){

        appkey="ea1f0459efc02a79f046f982767939ae";
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
@@ -280,7 +280,7 @@
    public synchronized R testFinish(@RequestHeader(required = false) String appkey,
                                @RequestBody(required = false) Review param,
                                HttpServletRequest request){

        appkey="ea1f0459efc02a79f046f982767939ae";
        auth(appkey, param, request);
        Map<String,Boolean> map=new HashMap<>();


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

@@ -186,7 +186,7 @@
    @TableField("fire_status")
    private Integer fireStatus;

//    产品状态{0:无,1:待测,2:测试中;3.测试完成;4.静置中;5:静置完成}
//    产品状态{0:无,1:待测,2:测试中;3.测试完成;4.静置中;5:静置完成;6:暂停测试;7:紧急出库;}
    @ApiModelProperty(value= "")
    @TableField("pack_status")
    private Integer packStatus;

 src/main/java/com/zy/asrs/entity/param/Review.java

@@ -8,6 +8,8 @@
    private String locNo;
//    用户码
    private String userId;
//    通道号
    private String channel;
//    PACK条码
    private String barcode;
//    请求时间, yyyy-MM-dd HH:mm:ss

 src/main/java/com/zy/asrs/service/MobileService.java

@@ -39,6 +39,6 @@
    //pda申请测试调用
    void startUpTestPACK(TestMast testMast);
    //暂停测试
    void suspendTestPACK();
    void suspendTestPACK(String channel);

}

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

@@ -661,8 +661,8 @@
    }
    @Override
    @Transactional
    public void suspendTestPACK() {
        ReturnT<String> result=suspendTestPACK1();
    public void suspendTestPACK(String channel) {
        ReturnT<String> result=suspendTestPACK1(channel);
        if (!result.isSuccess()) {
            log.error("暂停测试失败");
        }
@@ -674,6 +674,7 @@
            review.setLocNo(testMast.getLocNo());
            review.setUserId(testMast.getUserId());
            review.setBarcode(testMast.getBarcode());
            review.setChannel(testMast.getChannel().toString());
            review.setRequestTime(DateUtils.convert(new Date()));
            return postMesData(renUrl,startUpTestPACK,review);
        }catch (Exception e) {
@@ -684,10 +685,11 @@
        }
    }
    @Transactional
    public ReturnT<String> suspendTestPACK1(){
    public ReturnT<String> suspendTestPACK1(String channel){
        try {
            Review review=new Review();
            review.setPause(true);
            review.setChannel(channel);
            review.setRequestTime(DateUtils.convert(new Date()));
            return postMesData(renUrl,suspendTestPACK,review);
        }catch (Exception e) {

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

@@ -580,6 +580,15 @@
    @Transactional
    public void combPACK(CombParam param) {
        if (Cools.isEmpty(param.getPackNo())) {
            throw new CoolException("缺少参数：packNo");
        }else if (Cools.isEmpty(param.getPackName())){
            throw new CoolException("缺少参数：packName");
        }else if (Cools.isEmpty(param.getSettingTimes())){
            throw new CoolException("缺少参数：settingTimes");
        }else if (Cools.isEmpty(param.getRequestTime())){
            throw new CoolException("缺少参数：requestTime");
        }
        if (Cools.isEmpty(param.getPackNo())) {
            throw new CoolException(BaseRes.PARAM);
        }
        // 判断是否有相同Pack码的数据
@@ -630,6 +639,15 @@
    @Transactional
    public void combPackOut(CombParam param) {
        if (Cools.isEmpty(param.getPackNo())) {
            throw new CoolException("缺少参数：packNo");
        }else if (Cools.isEmpty(param.getPackName())){
            throw new CoolException("缺少参数：packName");
        }else if (Cools.isEmpty(param.getSettingTimes())){
            throw new CoolException("缺少参数：settingTimes");
        }else if (Cools.isEmpty(param.getRequestTime())){
            throw new CoolException("缺少参数：requestTime");
        }
        if (Cools.isEmpty(param.getPackNo())) {
            throw new CoolException(BaseRes.PARAM);
        }
        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()

 src/main/resources/application.yml

@@ -60,8 +60,8 @@
  outPath: mes-pm/in/stock/condition/exWarehouse

ren:
  url: 172.28.15.251:7899
  url: 172.28.15.196:12784
  # 启动测试请求
  startUpTestPACK: ynwms/open/asrs/rpv/test/open/auth
  startUpTestPACK: TestStart
  #暂停测试
  suspendTestPACK: ynwms/open/asrs/rpv/test/open/auth