inspect-server/src/main/java/com/yuanchu/mom/pojo/vo/RawInsProductVo.java

@@ -29,14 +29,12 @@
    /**
     * 标准值
     **/
    @NotBlank(message = "标准值不能为空!")
    @JsonSerialize
    private String required;

    /**
     * 内控值
     **/
    @NotBlank(message = "内控值不能为空!")
    @JsonSerialize
    private String internal;


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

@@ -34,15 +34,15 @@
    @Autowired
    private RawInspectService rawInspectService;

    // // 原材料检验子数据
    //原材料检验子数据
    @Autowired
    private RawInsProductService rawInsProductService;

    // 半成品检验
    //产品检验
    @Autowired
    private FinishedInspectService finishedInspectService;

    // 在制品检验
    //过程检验
    @Autowired
    private ProcessInspectService processInspectService;

@@ -79,6 +79,7 @@
        return inspectUnacceptedMapper.update(new InspectUnaccepted(), updateWrapper);
    }

    //编辑处置意见确定按钮
    @Override
    public Integer editDisposalOpinionConfirmation(Integer rawUnacceptedId, String opinionTell, Integer way, Integer type) {
        LambdaUpdateWrapper<InspectUnaccepted> updateWrapper = Wrappers.<InspectUnaccepted>lambdaUpdate()
@@ -97,11 +98,11 @@
                // 批量保存子级
                rawInsProductService.batchAddInsProduct(rawInspect.getId(), map.getRawInsProducts());
            }
            // 等于1：半成品
            // 等于1：产品
            else if (type == 1) {
                // TODO 该接口只剩余这两处
            }
            // 等于2：在制品
            // 等于2：过程
            else if (type == 2) {
                // TODO 该接口只剩余这两处
            }

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

@@ -183,6 +183,8 @@
                    .build();
            inspectUnacceptedMapper.insert(rawUnaccepted);
        }
        /*检验完成后，无论合格与否，将IFS报检状态更改为已接收*/

        return rawInspect.getJudgeState().toString();
    }


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

@@ -4,6 +4,7 @@
import cn.hutool.http.HttpRequest;
import com.yuanchu.mom.utils.JsonUtil;
import com.yuanchu.mom.vo.Result;
import sun.net.www.http.HttpClient;

import java.util.*;
import java.util.stream.Collectors;
@@ -27,6 +28,8 @@
    private static final String IFS_URL = "http://192.168.20.47:8008/PurchService.ashx?contract=ZTKJ&contractKey=4ttDeLKNsZuhstjtROMcRE1USNFXKdFYE7lQ2p1m5Bo=&procedureName=QUERY_POL_RECEIPT_STD&userId=mes_user&inAttr={\"ORDER_NO\":\"-2050314\"}";

    private static final String IMPORT_POL_RECEIVE = "http://192.168.20.47:8081/ErpServices/PurchaseReceiptService/importPolReceive";

    private static final String IFS_UPDATE="http://192.168.20.47:8081/ErpServices/PurchaseReceiptService/importPolReceive";

    private static final Map<String, String> GET_TOKEN_HEADER = new HashMap<>(2);

@@ -101,7 +104,6 @@
     */
    public static List<Map<String, Object>> ifsInterfaces() {
        String result = HttpRequest.get(IFS_URL)
                .header("Authorization", "Bearer " + getToken())
                .execute().body();
        Map<String, Object> map = JsonUtil.jsonToPojo(result, Map.class);
        return JsonUtil.jsonToPojo(JsonUtil.jsonToString(map.get("LIST_INFO")), List.class);
@@ -129,4 +131,8 @@
        List<BatchInfo> batchInfos = Arrays.asList(batchInfo);
        System.out.println(importPolReceive(batchInfos));
    }

    public static void ifsUpdate(){

    }
}

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

@@ -17,71 +17,7 @@

    @Test
    void contextLoads() {
        List<Map<String, Object>> order = SyncOrder.getMainOrder("2023-08-01 10:00:00 ");
        List<Sale> list = order.stream().map(orde -> {
            Sale sale = new Sale();
            sale.setOrderNumber(orde.get("orderNo").toString());//订单编号
            sale.setCode(String.valueOf(orde.get("customerContractNumber")));//客户合同编号
            sale.setName(orde.get("projectName").toString());//工程名称
            sale.setProname(orde.get("customerName").toString());//客户名称
            sale.setOrderName(orde.get("createdName").toString());//下单人
            sale.setSaleman(orde.get("salesmanName").toString());//业务员
            sale.setDelTime(DateUtil.parseDate(orde.get("wantedDeliveryDate").toString()));//交货日期
            sale.setCreateTime(DateUtil.parseDate(orde.get("orderDate").toString()));//下单日期
            sale.setNote(String.valueOf(orde.get("comment")));//备注
            return sale;
        }).collect(Collectors.toList());
        //System.out.println(list);
        for (Sale sale : list) {
            List<Map<String, Object>> innerOrder = SyncOrder.getInnerOrder("2023-08-01 10:00:00", sale.getOrderNumber());
            List<SaleMaterial> saleMaterials = innerOrder.stream().map(inorder -> {
                SaleMaterial saleMaterial = new SaleMaterial();
                saleMaterial.setName(inorder.get("productName").toString()); //产品名称
                saleMaterial.setSpecifications(inorder.get("specificationModel").toString()); //产品规格型号
                saleMaterial.setUnit(inorder.get("unit").toString());   //单位
                saleMaterial.setNumber((int) Double.parseDouble(inorder.get("quantity").toString()));  //数量
                saleMaterial.setPrice(inorder.get("unitPriceInclTax").toString());  //单价
                saleMaterial.setSaleId(sale.getId());  //关联 销售单id
                saleMaterial.setAdress(String.valueOf(inorder.get("shippingAddress")));  //收货地址
                saleMaterial.setUsername(String.valueOf(inorder.get("receivingContact")));  //联系人
                saleMaterial.setPhone(String.valueOf(inorder.get("receivingContactPhone")));  //手机号
                return saleMaterial;
            }).collect(Collectors.toList());
            System.out.println(saleMaterials);
        }
    }

    @Test
    void aaa() {
        int orderId = 773699;
        List<Map<String, Object>> attachment = SyncOrder.getAttachmentByOrderId(orderId);
        List<String> list = new ArrayList<>();
        for (Map<String, Object> attch : attachment) {
            String path = attch.get("path").toString();
            list.add(path);
        }
        System.out.println(list);
    }

    @Test
    void bb() {
        List<Map<String, Object>> mapList = SyncOrder.ifsInterfaces();
        List<RawInspect> rawInspectList = mapList.stream().map(map -> {
            RawInspect rawInspect = new RawInspect();
            if (map.get("PART_NO").toString().equals("A0410008010700")) {
                rawInspect.setCode(map.get("PART_NO").toString());   //原材料编码
                String[] split = map.get("PART_DESC").toString().split("，");
                rawInspect.setName(split[0]);   //原材料名称
                rawInspect.setSpecifications(split[1]);  //型号规格
                rawInspect.setUnit(map.get("BUY_UNIT_MEAS").toString());  //单位
                rawInspect.setNumber(Integer.parseInt(String.valueOf(map.get("QTY_TO_INSPECT"))));  //数量
                rawInspect.setInsState(0); //未检验
                rawInspect.setFormTime(DateUtil.parse(map.get("APPROVED_DATE").toString())); //来料日期
                rawInspect.setSupplier(map.get("SUPPLIER_NAME").toString()); //供应商
            }
            return rawInspect;
        }).collect(Collectors.toList());
        System.out.println(rawInspectList);
    }

}