Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

18516761980

2022-06-27 3a711d808ec2b3afea5c46a94ab2b544fb295ca4

Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into hylyasrs

# Conflicts:
#	src/main/java/com/zy/asrs/controller/MatCodeController.java
#	src/main/java/com/zy/asrs/utils/VersionUtils.java
#	src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
#	src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
#	src/main/resources/application.yml

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

@@ -1,8 +1,13 @@
package com.zy.asrs.service;

import com.alibaba.fastjson.JSONObject;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;

import java.util.Date;

public interface MobileService {

@@ -19,4 +24,7 @@
    void packComb(CombParam param, Long userId);

    void pakoutByOrder(JSONObject param, Long userId);

    void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
                  Double curOutQty, Integer ioType, Long userId, Date now);
}

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

@@ -444,7 +444,7 @@
                Double curOutQty = outQty >= locDetl.getAnfme() ? locDetl.getAnfme() : outQty;   //本次出库量
                int ioType = sumCount <= curOutQty ? 101 : 103;

//                stockOut(orderDetl, staNo, locDetl, curOutQty, ioType, userId);
//                stockOut(orderDetl, sta, locDetl, curOutQty, ioType, userId);
                order.setSettle(2L);
                order.setUpdateBy(userId);
                order.setUpdateTime(now);
@@ -467,4 +467,10 @@
        }
    }

    @Override
    @Transactional
    public void stockOut(OrderDetl orderDetl, BasDevp staNo, LocDetl locDetl,
                         Double curOutQty, Integer ioType, Long userId, Date now) {

    }
}