#

18516761980

2021-09-14 acfbd1420910ca3a0844166822ed792be40c4e65

#

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

@@ -20,6 +20,7 @@
import com.zy.common.service.CommonService;
import com.zy.ints.entity.WaitMatchk;
import com.zy.ints.service.IoCompleteService;
import com.zy.ints.service.WaitMatchkLogService;
import com.zy.ints.service.WaitMatchkService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -66,6 +67,8 @@
    private WrkDetlLogService wrkDetlLogService;
    @Autowired
    private WaitMatchkService waitMatchkService;
    @Autowired
    private WaitMatchkLogService waitMatchkLogService;
    @Autowired
    private IoCompleteService ioCompleteService;

@@ -197,6 +200,14 @@
            for (LocDetlDto locDetlDto : locDetlDtos) {
//            String replace = UUID.randomUUID().toString().replace("-", "");
                LocDetl locDetl = locDetlDto.getLocDetl();

                //////插入盘点档前，将通知档之前相同库位数据转历史档
                List<WaitMatchk> waitMatchks = waitMatchkService.selectList(new EntityWrapper<WaitMatchk>().eq("loc_no",locDetl.getLocNo()));
                for(WaitMatchk one : waitMatchks){
                    waitMatchkLogService.save(one.getBillNo(),one.getLocNo(),one.getMatNo());
                    waitMatchkService.delete(new EntityWrapper<WaitMatchk>().eq("bill_no",one.getBillNo()).eq("loc_no",one.getLocNo()).eq("mat_no",one.getMatNo()));
                }

                //生成盘点档
                WaitMatchk waitMatchk = new WaitMatchk();
                waitMatchk.setBillNo(billNo);//订单编号

 src/main/java/com/zy/ints/controller/ERPApiController.java

New file
@@ -0,0 +1,36 @@
package com.zy.ints.controller;

import com.core.annotations.ManagerAuth;
import com.core.common.R;
import com.zy.common.web.BaseController;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * 提供API接口供ERP调用，下发任务单据
 * Created by TQS on 2021/9/14
 */
@RestController
@RequestMapping("erp")
public class ERPApiController extends BaseController {

    @RequestMapping("/waitIn/auth")
    @ManagerAuth(memo = "ERP下发入库单")
    public R getWaitMatin(@RequestBody String param){
        return R.ok().add("");
    }

    @RequestMapping("/waitOut/auth")
    @ManagerAuth(memo = "ERP下发出库单")
    public R getWaitMatout(@RequestBody String param){
        return R.ok().add("");
    }

    @RequestMapping("/matCode/auth")
    @ManagerAuth(memo = "ERP下发物料基础数据")
    public R getMatCode(@RequestBody String param){
        return R.ok().add("");
    }

}