Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

昨天 a657efd0e2b95ea386317ac8931c5d85f4173b19

Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/controller/phyz/MESController.java

@@ -46,20 +46,6 @@
        if (Objects.isNull(objParams)) {
            throw new CoolException("参数不能为空！！");
        }
//        // 返回模拟数据
//        if (SIMULATED_DATA_ENABLE.equals("1")) {
//            JSONArray params = paramsFormat(objParams);
//            List<MatPreparationOrder> orders = JSON.parseArray(params.toJSONString(), MatPreparationOrder.class);
//            JSONArray array = ERPController.map;
//            for (int i = 0; i < ERPController.map.size(); i++) {
//                JSONObject obj = array.getJSONObject(i);
//                obj.put("orderNo", orders.get(0).getOrderNo());
//                obj.put("matNr", orders.get(0).getOrderItems().get(0).getMatNr());
//            }
//            ERPController.map = array;
//
//            return CommonResponse.ok();
//        }

        JSONArray params = paramsFormat(objParams);
        List<MatPreparationOrder> orders = JSON.parseArray(params.toJSONString(), MatPreparationOrder.class);

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/phyz/MatPreparationOrder.java

@@ -25,6 +25,11 @@
    // 备料类型，为备料单时有，1 正常领料；2 生产补料；
    @JsonProperty("prepareType")
    private Integer prepareType;

    // 是否需要出库
    @JsonProperty("out")
    private Boolean out;

    // 备料详情
    private List<MatPreparationOrderItem> orderItems;
}

 rsf-open-api/src/main/java/com/vincent/rsf/openApi/service/phyz/impl/MesReportServiceImpl.java

@@ -310,25 +310,6 @@
        headers.add("Content-Type", "application/json");
        headers.add("api-version", "v2.0");

//        List<Map<String, Object>> maps = new ArrayList<>();
//        Map<String, Object> mapParams = new HashMap<>();
//////        mapParams.put("orderNo", params.getOrderNo());
//////        mapParams.put("anfme", params.getAnfme());
//////        mapParams.put("type", params.getType());
//////        mapParams.put("wkType", params.getWkType());
//////        mapParams.put("exceStatus", params.getExceStatus());
//////        mapParams.put("orderItems", params.getOrderItems());
//////        maps.add(mapParams);
////
////        JSONObject params = JSONObject.parseObject(JSON.toJSONString(order));
////        JSONObject mappedData = ParamsMapUtils.apiMaps("mes", "orderId", params);
////        mappedData.put("updateBy", "mes");
////        mapParams = objectToMap(mappedData);
////        maps.add(mapParams);
//        log.info("修改订单信息及状态： {}， 请求参数： {}", wmsUrl, JSONArray.toJSONString(order));
//        HttpEntity<List<Map<String, Object>>> httpEntity = new HttpEntity<>(maps, headers);
////        ArrayList<Order> orders = new ArrayList<>();
////        orders.add(order);
        HttpEntity httpEntity = new HttpEntity<>(order, headers);
        // mes/callMaterial
        ResponseEntity<String> exchange = restTemplate.exchange(wmsUrl, HttpMethod.POST, httpEntity, String.class);//cs

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java

@@ -61,7 +61,8 @@
        try {
            WkOrder order = new WkOrder();
            String orderNo = params.getString("orderNo");
            order.setCode(orderNo).setPoCode(orderNo).setType(OrderType.ORDER_Pre.type)
            boolean out = params.getBoolean("out");
            order.setCode(orderNo).setPoCode(orderNo).setType(out?OrderType.ORDER_PRE.type:OrderType.ORDER_PRE_NOT_OUT.type)
//                    .setWkType(OrderWorkType.ORDER_WORK_TYPE_MATERIAL_PREPARATION.type)
                    .setCreateBy(getLoginUserId())
                    .setUpdateBy(getLoginUserId());
@@ -86,11 +87,6 @@
                    qty = item.getDouble("anfme");
                }
                map.put("anfme", qty);
//                map.put("unit", item.getString("unit"));
//                map.put("splrCode", item.getString("splrCode"));
//                map.put("splrName", item.getString("splrName"));
//                map.put("splrBatch", item.getString("splrBatch"));
//                map.put("platItemId", item.getString("platItemId"));
                items.add(map);
            }


 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java

@@ -14,7 +14,8 @@
    ORDER_TRANSFER("transfer", "调拔单"),
    ORDER_REVISE("revise", "库存调整"),
    ORDER_CHECK("check", "盘点单"),
    ORDER_Pre("pre","备货单");
    ORDER_PRE("pre","备货单,出库"),
    ORDER_PRE_NOT_OUT("preNot","备货单，不出");


    OrderType(String type, String desc) {