修改4.0 9.25

zss

2023-09-25 44a9b4729e058e75dfba2892803038ee91963d77

修改4.0   9.25

 inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java

@@ -6,6 +6,7 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -24,6 +25,7 @@
 * @since 2023-08-07 10:04:01
 */
@RestController
@Api(tags = "QMS管理-->不合格品处置")
@RequestMapping("/inspectUnaccepted")
public class InspectUnacceptedController {


 inspect-server/src/main/java/com/yuanchu/mom/service/RawInspectService.java

@@ -22,7 +22,7 @@
     * @param code
     * @return
     */
    RawInspectVo chooseIFS(String code);
    List<RawInspectVo> chooseIFS(String code);

    /**
     * 新增原材料检验单

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/FinishedInspectServiceImpl.java

@@ -129,9 +129,9 @@
                    .eq("inspect_id", id)
                    .eq("result", 0)
                    .eq("type", 2));
            String msg = null;
            String msg = "";
            for (InspectionItem inspectionItem : inspectionItemList) {
                msg += inspectionItem.getName();
                msg =msg+ inspectionItem.getName()+"-";
            }
            InspectUnaccepted finishUnaccepted = InspectUnaccepted.builder()
                    .reason(msg + "不合格")  //暂且定义为项目+不合格

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/ProcessInspectServiceImpl.java

@@ -103,12 +103,12 @@
                    .eq("inspect_id", id)
                    .eq("result", 0)
                    .eq("type", 1));
            String msg = null;
            String msg = "";
            for (InspectionItem inspectionItem : inspectionItemList) {
                msg += inspectionItem.getName();
                msg = msg + inspectionItem.getName() + "-";
            }
            InspectUnaccepted processUnaccepted = InspectUnaccepted.builder()
                    .reason(processInspect.getTechname() + msg + "不合格")  //定义为工艺+项目不合格
                    .reason(processInspect.getTechname() + "-" + msg + "不合格")  //定义为工艺+项目不合格
                    .number(number)
                    .rawInspectId(id)
                    .type(2)        //类型为过程检验

 inspect-server/src/main/java/com/yuanchu/mom/service/impl/RawInspectServiceImpl.java

@@ -16,7 +16,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
@@ -46,13 +45,14 @@

    //新增原材料检验单-->根据原材料编码得到ifs中的报检数据
    @Override
    public RawInspectVo chooseIFS(String code) {
        RawInspectVo rawInspectVo = new RawInspectVo();
    public List<RawInspectVo> chooseIFS(String code) {
        List<RawInspectVo> rawInspectVos = new ArrayList<>();
        List<Map<String, Object>> mapList = SyncOrder.ifsInterfaces();
        for (Map<String, Object> map : mapList) {
            // todo: 后续需要将状态改成待检验
            if (map.get("STATE").equals("已接收")) {
                if (map.get("PART_NO").toString().equals(code)) {
                    RawInspectVo rawInspectVo = new RawInspectVo();
                    rawInspectVo.setCode(map.get("PART_NO").toString());   //原材料编码
                    String[] split = map.get("PART_DESC").toString().split("，");
                    rawInspectVo.setName(split[0]);   //原材料名称
@@ -67,24 +67,26 @@
                    String lotBatchNo = map.get("LOT_BATCH_NO").toString();//批号
                    String locationNo = map.get("LOCATION_NO").toString();//库位号
                    rawInspectVo.setMessage(orderNo+","+releaseNo+","+lineNo+","+lotBatchNo+","+locationNo);
                    rawInspectVos.add(rawInspectVo);

                    //查询该原材料是否有检验项目记录
                    RawInspect rawInspect = rawInspectMapper.selOneByCode(code);
                    if (ObjectUtils.isNotEmpty(rawInspect)) {
                        List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query().eq("raw_inspect_id", rawInspect.getId()));
                        List<RawInsProductVo> rawInsProductVos = rawInsProductList.stream().map(rawInsProduct -> {
                            RawInsProductVo rawInsProductVo = new RawInsProductVo();
                            rawInsProductVo.setName(rawInsProduct.getName());
                            rawInsProductVo.setUnit(rawInsProduct.getUnit());
                            rawInsProductVo.setRequired(rawInsProduct.getRequired());
                            rawInsProductVo.setInternal(rawInsProduct.getInternal());
                            return rawInsProductVo;
                        }).collect(Collectors.toList());
                        rawInspectVo.setRawInsProducts(rawInsProductVos);
                    }
                }
            }
        }
        //查询该原材料是否有检验项目记录
        RawInspect rawInspect = rawInspectMapper.selOneByCode(code);
        if (ObjectUtils.isNotEmpty(rawInspect)) {
            List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query().eq("raw_inspect_id", rawInspect.getId()));
            List<RawInsProductVo> rawInsProductVos = rawInsProductList.stream().map(rawInsProduct -> {
                RawInsProductVo rawInsProductVo = new RawInsProductVo();
                rawInsProductVo.setName(rawInsProduct.getName());
                rawInsProductVo.setUnit(rawInsProduct.getUnit());
                rawInsProductVo.setRequired(rawInsProduct.getRequired());
                rawInsProductVo.setInternal(rawInsProduct.getInternal());
                return rawInsProductVo;
            }).collect(Collectors.toList());
            rawInspectVo.setRawInsProducts(rawInsProductVos);
        }
        return rawInspectVo;
        return rawInspectVos;
    }

    //新增原材料检验单
@@ -185,9 +187,9 @@
            List<RawInsProduct> rawInsProductList = rawInsProductMapper.selectList(Wrappers.<RawInsProduct>query()
                    .eq("raw_inspect_id", id)
                    .eq("test_state", 0));
            String msg = null;
            String msg ="";
            for (RawInsProduct rawInsProduct : rawInsProductList) {
                msg+=rawInsProduct.getName();
                msg=msg+rawInsProduct.getName()+"-";
            }
            InspectUnaccepted rawUnaccepted = InspectUnaccepted.builder()
                    .reason(msg + "不合格")  //定义为不合格的项目+不合格

 inventory-server/src/main/java/com/yuanchu/mom/Task/SyncOrder.java

@@ -114,20 +114,4 @@
                .header("content-type", "application/json")
                .execute().body();
    }

    public static void main(String[] args) {
        BatchInfo batchInfo = new BatchInfo();
        batchInfo.setOrderNo("260984");
        batchInfo.setReleaseNo("1");
        batchInfo.setLineNo("1");
        batchInfo.setPartNo("A0190008000400");
        batchInfo.setLotBatchNo("*");
        batchInfo.setLocationNo("QC01");
        batchInfo.setQtyToReceive(1);
        batchInfo.setQtyToInspect(0);
        batchInfo.setReceiveCase("接收到来料区");
        List<BatchInfo> batchInfos = Arrays.asList(batchInfo);
        System.out.println(importPolReceive(batchInfos));
    }

}

 system-run/src/test/java/com/yuanchu/mom/SystemRunApplicationTest.java

@@ -17,7 +17,6 @@

    @Test
    void contextLoads() {

    }

}