完善

cp

2024-11-21 e400c6f84ad6e777ae32597d01eb2d0fd79f5e56

 zy-asrs-openapi/src/main/java/com/zy/asrs/openapi/controller/ApiController.java

@@ -8,6 +8,9 @@
import com.zy.asrs.common.openapi.entity.param.*;
import com.zy.asrs.common.openapi.service.ApiService;
import com.zy.asrs.common.openapi.service.HostKeyService;
import com.zy.asrs.common.sys.entity.OperateLog;
import com.zy.asrs.common.sys.service.OperateLogService;
import com.zy.asrs.common.utils.Utils;
import com.zy.asrs.common.web.BaseController;
import com.zy.asrs.common.wms.entity.DocType;
import com.zy.asrs.common.wms.entity.OrderSettle;
@@ -15,6 +18,7 @@
import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.openapi.param.MatParam;
import com.zy.asrs.openapi.param.OrderParam;
@@ -24,6 +28,7 @@
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -172,6 +177,19 @@
//            System.out.println(map.toString());
            log.info("order/execute/auth/v1：" + JSON.toJSONString(map));
            OrderParam orderParam = JSON.parseObject(JSON.toJSONString(map), OrderParam.class);

            OperateLogService operateLogService = SpringUtils.getBean(OperateLogService.class);
            //记录上报数据
            OperateLog operateLog = new OperateLog();
            operateLog.setAction("ERP推送订单");
            operateLog.setRequest(orderParam.toString());
            operateLog.setResponse("");
            operateLog.setCreateTime(new Date());
            operateLog.setSystem("WMS");
            operateLog.setUserId(9527L);
            operateLog.setIp("127.0.0.1");
            operateLogService.save(operateLog);

            List<DocType> list = apiService.getOrderType();
            DocType type = null;
            for (DocType docType : list) {
@@ -185,6 +203,7 @@
            }

            ArrayList<GenerateOrderMatParam> mats = new ArrayList<>();
            String matnr=null;
            for (MatParam matParam : orderParam.getList()) {
                GenerateOrderMatParam mat = new GenerateOrderMatParam();
                mat.setMatnr(matParam.getMatnr());
@@ -194,7 +213,22 @@
                mat.setWarehouse(matParam.getWarehouse());
                mat.setOrigin(matParam.getOrigin());
                mat.setOriginNo(matParam.getOriginNo());
                mats.add(mat);
                if(Cools.isEmpty(mats)){
                    mats.add(mat);
                }else{
                    boolean boo=true;
                    for (GenerateOrderMatParam m:mats
                         ) {
                        if(m.getMatnr().equals(matParam.getMatnr())){
                            m.setAnfme(m.getAnfme()+mat.getAnfme());
                            boo=false;
                            break;
                        }
                    }
                    if(boo){
                        mats.add(mat);
                    }
                }
            }

            if (orderParam.getInOut() == 1) {