外购原材料合格移库库位调整为W03

zouyu

11 小时以前 47cbf9a89b8c828634aa6c12224223d88eaf9da7

外购原材料合格移库库位调整为W03

 inspect-server/src/main/java/com/ruoyi/inspect/aspect/MoveLocationAfterPushMesStockAspect.java

@@ -34,7 +34,7 @@
    @Autowired
    private MesApiUtils mesApiUtils;

    private final static String LOCATION_NO = "WG-02-001";//mes外购合格库位
    public final static String LOCATION_NO = "WG-02-001";//mes外购合格库位

    @Autowired
    private NumberGenerator<IfsSplitOrderRecord> splitOrderRecordNumberGenerator;

 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderServiceImpl.java

@@ -27,7 +27,9 @@
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.User;
import com.ruoyi.common.numgen.NumberGenerator;
import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.LimsDateUtil;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.api.IfsApiUtils;
import com.ruoyi.framework.exception.ErrorException;
import com.ruoyi.inspect.dto.*;
@@ -1205,7 +1207,12 @@
         * TODO 后续需要调用IFS的接口 移入的库位号 toLocation
         */
        // 检验后移库
        toLocation = "1301";
        if(one.getIsSplitOrder().equals(1)){
            //如果订单为原材料的拆分订单，则移到外购库位
            toLocation = "W03";
        }else{
            toLocation = "1301";
        }
        Map<String, Object> moveResultMap = new HashMap<>();
        List<Map<String, Object>> moveResultList = new ArrayList<>();
        Map<String, Object> moveMap = new HashMap<>();

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -155,7 +155,7 @@
  ztzb:
    ip: http://192.168.7.48:8100
    user: chen
    password: ojAX5Ws3z0/LXRtjGdjKYQ==
    password: u3QMBneOYFqgWoMYdWzjjg==

ifs:
  contract: ZTZB