no message

skyouc

4 天以前 828641ce9d4178bbff9030ad19ce93d0267f185c

no message

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/OutStockController.java

@@ -99,7 +99,6 @@
     * 播种墙拍灯，ESS调用
     */
    @PostMapping("/light/off")
    @Transactional(rollbackFor = Exception.class)
    public R lightOff(@RequestBody Map<String, Object> request) {
        if (Objects.isNull(request)) {
            throw new CoolException("参数不能为空！！");

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/timer/TaskWaveTimer.java

@@ -205,7 +205,7 @@
                            waveSeed.setWaveId(taskDetl.getWaveId()).setWaveNo(taskDetl.getWaveNo());

                            waveSeed.setTaskDetlId(taskDetl.getId());

                            //为满足当前需求，经确认，改成订单数量

                            waveSeed.setAnfme(taskDetl.getAnfme());

                            waveSeed.setAnfme(orderDetl.getAnfme());

                            waveSeed.setWorkQty(0D);

                            waveSeed.setMatnr(taskDetl.getMatnr());

                            waveSeed.setBatch(taskDetl.getBatch());


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java

@@ -62,9 +62,9 @@


    @PostMapping("/login")

    public R login(@RequestBody LoginParam param, HttpServletRequest request) {

//        if (!licenseTimer.getSystemSupport()) {//许可证已失效

//            return R.parse(CodeRes.SYSTEM_20001);

//        }

        if (!licenseTimer.getSystemSupport()) {//许可证已失效

            return R.parse(CodeRes.SYSTEM_20001);

        }

        String username = param.getUsername();

        Long hostId = param.getHostId();

        User user = userService.getByUsername(username, hostId);


 zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/LicenseCheckListener.java

@@ -101,7 +101,6 @@
                    int day = (int) (num / 24 / 60 / 60 / 1000);

                    licenseTimer.setLicenseDays(day);

                }



                return install != null;

            } catch (Exception e) {

                return false;


 zy-asrs-wms/src/main/resources/mapper/asrs/TaskMapper.xml

@@ -30,7 +30,7 @@
                mws.matnr,

                mws.order_no,

                mws.order_id,

                od.anfme AS rev_qty,

                mws.anfme AS rev_qty,

                SUM( mws.anfme ) anfme,

                mws.wave_no,

                SUM( mws.work_qty ) work_qty,