#

luxiaotao1123

2020-06-11 c49d38e3abd223c5f60d3d5fef53144a2d0c6e25

#

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

@@ -6,7 +6,6 @@
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.service.WrkLastnoService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.service.DoubleDeepService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,8 +24,6 @@
    private BasDevpService basDevpService;
    @Autowired
    private DoubleDeepService doubleDeepService;
    @Autowired
    private WrkLastnoService wrkLastnoService;

    @Override
    @Transactional
@@ -38,7 +35,7 @@
        // 站点状态检测
        basDevpService.checkSiteStatus(param.getDevpNo());
        // 生成工作号
        int workNo = doubleDeepService.getWorkNo(wrkLastnoService.selectById(0));
        int workNo = doubleDeepService.getWorkNo(0);


//        if (staNo == null || staNo.get)

 src/main/java/com/zy/common/service/DoubleDeepService.java

@@ -3,6 +3,7 @@
import com.core.common.Cools;
import com.zy.asrs.entity.WrkLastno;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.WrkLastnoService;
import com.zy.asrs.service.WrkMastService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -16,13 +17,16 @@

    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private WrkLastnoService wrkLastnoService;

    /**
     * 生成工作号
     * @param wrkLastno
     * @param wrkMk 0:入出库 ; 1:其他
     * @return
     */
    public int getWorkNo(WrkLastno wrkLastno) {
    public int getWorkNo(Integer wrkMk) {
        WrkLastno wrkLastno = wrkLastnoService.selectById(wrkMk);
        int workNo = 0;
        // 入出库类型
        if (wrkLastno.getWrkMk() == 0) {
@@ -44,7 +48,8 @@

                if (workNo > 0){
                    // todo

                    wrkLastno.setWrkNo(workNo);
                    wrkLastnoService.updateById(wrkLastno);
                }
            }