#

luxiaotao1123

2022-05-06 4b0ca1869941ef3074605b4162df3b1b8582f8e5

#

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

@@ -4,6 +4,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
@@ -11,12 +12,16 @@
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.Date;
import java.util.HashSet;
import java.util.List;
import java.util.Set;

/**
 * 移动端接口控制器
@@ -127,6 +132,41 @@
        return R.ok();
    }

    @RequestMapping("/pakout/confirm/auth")
    @ManagerAuth
    @Transactional
    public R pakoutConfirm(@RequestBody List<WrkDetl> list) {
        if (Cools.isEmpty(list)) {
            return R.ok();
        }
        Set<Integer> wrkNos = new HashSet<>();
        for (WrkDetl wrkDetl : list) {
            wrkNos.add(wrkDetl.getWrkNo());
            wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
        }
        for (Integer wrkNo : wrkNos) {
            WrkMast wrkMast = wrkMastService.selectById(wrkNo);
            if (wrkMast.getWrkSts() == 14 && (Cools.isEmpty(wrkMast.getInvWh()) || wrkMast.getInvWh().equals("N"))) {
                List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkNo);
                boolean complete = true;
                for (WrkDetl wrkDetl : wrkDetls) {
                    if (wrkDetl.getInspect() == null || wrkDetl.getInspect() == 0) {
                        complete = false;
                        break;
                    }
                }
                if (complete) {
                    wrkMast.setInvWh("Y");
                    wrkMast.setModiTime(new Date());
                    if (!wrkMastService.updateById(wrkMast)) {
                        throw new CoolException("修改工作档" + wrkNo + "失败");
                    }
                }
            }
        }
        return R.ok();
    }


    // 盘点 ----------------------------------------------------------------------------------------------------


 src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java

@@ -20,4 +20,6 @@

    List<WrkDetl> selectAndLogByOrderNo(String orderNo);

    int updateInspect( @Param("wrkNo")Integer wrkNo, @Param("matnr")String matnr, @Param("batch")String batch);

}

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

@@ -16,4 +16,6 @@

    List<WrkDetl> selectAndLogByOrderNo(String orderNo);

    boolean updateInspect(Integer wrkNo, String matnr, String batch);

}

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

@@ -70,4 +70,9 @@
    public List<WrkDetl> selectAndLogByOrderNo(String orderNo) {
        return this.baseMapper.selectAndLogByOrderNo(orderNo);
    }

    @Override
    public boolean updateInspect(Integer wrkNo, String matnr, String batch) {
        return this.baseMapper.updateInspect(wrkNo, matnr, batch) > 0;
    }
}

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -87,4 +87,13 @@
        select * from asr_wrk_detl_log where order_no = #{orderNo}
    </select>

    <update id="updateInspect">
        update asr_wrk_detl
        set inspect = 1
        where 1=1
        and wrk_no = #{wrkNo}
        and matnr = #{matnr}
        <include refid="batchSeq"></include>
    </update>

</mapper>