Merge remote-tracking branch 'origin/master'

mrzhssss

2022-03-24 d5a456fee1dd3b6beda90ec6cc1b91814ec2750f

 src/main/java/zy/cloud/wms/manager/controller/QualityController.java

@@ -5,17 +5,21 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.core.common.*;
import org.apache.poi.ss.formula.functions.Now;
import zy.cloud.wms.manager.entity.Quality;
import zy.cloud.wms.manager.entity.QualityDetl;
import zy.cloud.wms.manager.entity.Receive;
import zy.cloud.wms.manager.entity.ReceiveDetl;
import zy.cloud.wms.manager.service.QualityDetlService;
import zy.cloud.wms.manager.service.QualityService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import zy.cloud.wms.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.manager.service.ReceiveDetlService;

import java.text.SimpleDateFormat;
import java.util.*;

@RestController
@@ -23,6 +27,12 @@

    @Autowired
    private QualityService qualityService;
    @Autowired
    private ReceiveDetlService receiveDetlService;
    @Autowired
    private QualityDetlService qualityDetlService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @RequestMapping(value = "/quality/{id}/auth")
    @ManagerAuth
@@ -61,7 +71,29 @@
    @ManagerAuth
    public R add(Quality quality) {
        qualityService.insert(quality);
        Wrapper<ReceiveDetl> wrapper = new EntityWrapper<ReceiveDetl>();
        List<ReceiveDetl> list = receiveDetlService.selectList(wrapper.eq("order_no",quality.getUuid() ));
        if(list.size()>0){
        for(ReceiveDetl detl:list){
            QualityDetl qualityDetl = new QualityDetl();
            qualityDetl.setAnfme(detl.getAnfme());
            qualityDetl.setBillNo(quality.getBillNo());
            qualityDetl.setOrderNo(detl.getOrderNo());
            qualityDetl.setMatnr(detl.getMatnr());
            qualityDetl.setMaktx(detl.getMaktx());
            qualityDetl.setProdDate(new Date());
            qualityDetlService.insert(qualityDetl);
        }
        }
        return R.ok();
    }

    @RequestMapping("/quality/orderNo/init1")
    @ManagerAuth(memo = "生成单据编号")
    public R initOrderNo() {
        SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss");
        String orderNo = "  QC-" + String.valueOf(dateformat.format(new Date()));
        return R.ok().add(orderNo);
    }

   @RequestMapping(value = "/quality/update/auth")
@@ -83,6 +115,17 @@
        return R.ok();
    }

//    @RequestMapping("/orderNo/init1")
//    @ManagerAuth(memo = "生成单据编号")
//    public R initOrderNo() {
//        long nextId = snowflakeIdWorker.nextId();
//        String orderNo = "QC-" + String.valueOf(nextId).substring(0, 15);
//        if (qualityService.selectByOrderNo(orderNo, getHostId()) != null) {
//            return R.error("抱歉，单据编号已存在");
//        }
//        return R.ok().add(orderNo);
//    }

    @RequestMapping(value = "/quality/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){