#

pjb

2024-09-04 d62f66a249ee0f0e8393fb1d269d9ba540a8bd91

#

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

@@ -455,8 +455,8 @@
        return R.ok("入库成功");
    }

    @RequestMapping("/plaDetl/packin/v2")
    //@ManagerAuth(memo="pla入库")
    @RequestMapping("/plaDetl/packin/v1１")
    @ManagerAuth(memo="pla入库")
    @Transactional
    public R plaPackInTestErp(@RequestBody JSONObject json) throws ParseException {
        String locNo = json.get("locNo").toString();
@@ -470,11 +470,14 @@
                return R.error("有参数为空，无法入库");
            }
            //测试
            if(true){
            if(false){
                User user = new User();
                user.setUsername("test");
                mobileService.plaPakin(brand,locNo,batch,packageNo,user);
                json.put("user",user.getUsername());
            }else {
                mobileService.plaPakin(brand,locNo,batch,packageNo,getUser());
                json.put("user",getUser().getUsername());
            }
        }
        //入库成功后上报ERP

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

@@ -142,7 +142,7 @@

        Order order = this.selectById(orderId);

        int count = manPakOutService.selectCount(new EntityWrapper<ManPakOut>().eq("doc_name", order.getOrderNo()));
        int count = manPakOutService.selectCount(new EntityWrapper<ManPakOut>().eq("doc_num", order.getOrderNo()));

        if(count > 0){
            throw new CoolException("请先删除拣货单");

 src/main/resources/application.yml

@@ -8,7 +8,7 @@


spring:
  application:
  aporder/delete/authplication:
    name: @pom.build.finalName@
  jmx:
    enabled: false

 src/main/resources/license.lic

Binary files differ