#

whycq

2024-07-02 ff98dce5d697563771adf7ae08cae895d234874b

#

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

@@ -765,6 +765,13 @@

        List<LocDetlAdjustParam.LocDetlAdjust> list = param.getList();

        String zpallet = "";
        for (LocDetl locDetl : locDetls) {
            if (!Cools.isEmpty(locDetl.getZpallet())) {
                zpallet = locDetl.getZpallet();
            }
        }

        // 修改数量
        Iterator<LocDetl> iterator = locDetls.iterator();
        while (iterator.hasNext()) {
@@ -827,7 +834,7 @@
            LocDetl locDetl = new LocDetl();
            locDetl.sync(mat);
            locDetl.setBatch(adjust.getBatch());
            locDetl.setBarcode(locDetls.get(0).getBarcode());
            locDetl.setZpallet(zpallet);
            locDetl.setLocNo(locMast.getLocNo());
            locDetl.setAnfme(adjust.getCount()); // 数量
            locDetl.setModiUser(userId); // 操作人员信息

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -43,11 +43,12 @@
        }
    }

//    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0/1 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReport(){
        if (!erpEnable) return;
        String erpReport = Parameter.get().getErpReport();
//        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = orderService.selectComplete();
            for (Order order : orders) {

 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java

@@ -22,6 +22,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -77,7 +79,7 @@
            JSONObject std_data = jsonObject.getJSONObject("std_data");
            JSONObject execution = std_data.getJSONObject("execution");
            String code = execution.getString("code");
            JSONObject std_data1 = jsonObject.getJSONObject("parameter");
            JSONObject std_data1 = std_data.getJSONObject("parameter");
            JSONObject execution1 = std_data1.getJSONObject("response_result");
            String status = execution1.getString("Status");

@@ -88,6 +90,7 @@
                    throw new CoolException("服务器内部错误，请联系管理员");
                }
            } else {
                orderService.updateSettle(order.getId(), 7L, null);
                log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL + MesConstant.PAKIN_URL, body, response);
                throw new CoolException("上报mes系统失败");
            }
@@ -139,20 +142,35 @@
    }

    Map<String, Object> getHeaders(){
//        digi-type: sync
//        digi-protocol: raw
//        digi-host: {"prod":"XThirdParty","ver":"1.0","ip":"61.153.227.86","id":"XWMS","timezone":"+8","timestamp":"20240613062240538","acct":"dcms"}
//        digi-service: {"prod":"E10","name":"XCommon.ImportData","id":"XFX","ip":"139.196.196.39"}
//        digi-key: 504011D3B5AD32B465FE0C097C7FDAAC
//        digi-datakey: XCommon.ImportData
        // 获取当前时间
        LocalDateTime now = LocalDateTime.now();

        // 定义日期时间格式化器，根据你的需求定义格式
        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS");

        // 格式化日期时间为字符串
        String formattedDateTime = now.format(formatter);

        JSONObject digiHost = new JSONObject();
        digiHost.put("prod","XThirdParty");
        digiHost.put("ver","1.0");
        digiHost.put("ip","192.168.10.160");
        digiHost.put("ip","61.153.227.86");
        digiHost.put("id","XWMS");
        digiHost.put("timezone","+8");
        digiHost.put("timestamp",new Date().getTime());
        digiHost.put("timestamp",formattedDateTime);
        digiHost.put("acct","dcms");

        JSONObject digiService = new JSONObject();
        digiService.put("prod","E10");
        digiService.put("name","XCommon.ImportData");
        digiService.put("ip","192.168.10.160");
        digiService.put("id","SW_TEST_External");
        digiService.put("ip","139.196.196.39");
        digiService.put("id","XFX");

        String key = digiHost.toJSONString() + digiService.toJSONString();
        String keyMd5 = DigestUtils.md5Hex(key);

 src/main/java/com/zy/common/constant/MesConstant.java

@@ -5,7 +5,7 @@
 */
public class MesConstant {

    public static final String URL = "http://192.186.5.235:9990";
    public static final String URL = "123.157.250.242:9990";

    public static final String PACK_DOWN_URL = "mes/api/zy/v1/packDown/sendList";


 src/main/java/com/zy/common/utils/HttpHandler.java

@@ -15,7 +15,7 @@
 */
public class HttpHandler {

    private static final Integer DEFAULT_TIMEOUT_SECONDS = 5;
    private static final Integer DEFAULT_TIMEOUT_SECONDS = 10;
    private static final MediaType MEDIA_TYPE = MediaType.parse("application/json;charset=utf-8");

    private String uri;

 src/main/resources/application.yml

@@ -11,7 +11,7 @@
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=phpsasrs
    url: jdbc:sqlserver://10.10.10.235:1433;databasename=phpsasrs
    url: jdbc:sqlserver://10.10.10.233:1433;databasename=phpsasrs
    username: sa
    password: sa@123
  mvc:

 src/main/webapp/static/js/common.js

@@ -224,7 +224,7 @@
var detlCols = [
    {field: 'matnr', align: 'center',title: '商品编号', sort:true}
    ,{field: 'maktx', align: 'center',title: '商品名称', sort:true}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: true}
    ,{field: 'orderNo', align: 'center',title: '单据编号', hide: false}
    ,{field: 'batch', align: 'center',title: '批号', sort:true}
    ,{field: 'anfme', align: 'center',title: '数量'}
    ,{field: 'zpallet', align: 'center',title: '托盘条码'}