#

zjj

2024-09-23 539d9ffc477d28a23a923b41fdeabc8c37c99ce6

 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,10 +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
@@ -600,7 +604,7 @@

            plaService.updateById(pla);
            SaasUtils.insertLog(2,sourceLocNo,pla.getBrand(),pla.getWeightAnfme(),getUser().getUsername(),
                    locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
                    locNo,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);

        });