#

18516761980

2022-08-02 bd80bef8c6ea2763993ff3ef065ee474b11222a4

#

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

@@ -515,11 +515,13 @@
        List<LocNormal> locNormal = new ArrayList<>();
        List<LocNormal> locNormalResult = new ArrayList<>();
        for (Integer i = 0; i < matList.size(); i++) {
            if(matList.get(i).getFnumber().equals(matnr)){
                locNormal = baseMapper.queryLocNorlMatnr(matnr, mnemonic);
            }else {
                continue;
            }
//            matnr = matList.get(i).getFnumber();
//            if(matList.get(i).getFnumber().equals(matnr)){
//                locNormal = baseMapper.queryLocNorlMatnr(matnr, mnemonic);
//            }else {
//                continue;
//            }
            locNormal = baseMapper.queryLocNorlMatnr(matList.get(i).getFnumber(), mnemonic) ;
            if (locNormal.size() > 0) {
                for (LocNormal e:locNormal) {
                    LocNormal obj = new LocNormal();

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

@@ -204,9 +204,9 @@
        // 生成工作档
        for (OutLocDto dto : dtos) {
            // 判断入出库类型：101.全板出库 or 103.拣料出库
            if (ioType == null) {
//            if (ioType == null) {
                ioType = dto.isAll() ? 101 : 103;
            }
//            }
            // 获取库位
            LocMast locMast = locMastService.selectById(dto.getLocNo());
            // 获取路径

 src/main/java/com/zy/common/service/erp/task/ErpScheduler.java

@@ -233,6 +233,7 @@
            //同一单号存在相同物料编码数据，该单号不予处理
            Number fnumberCount = erpService.QueryFnumberOutCount(outStockBill.getFInterID());
            if(fnumberCount.intValue() > 1){
                log.info("出库通知单存在物料相同数据[FBillNo={},FInterID={},]", outStockBill.getFBillNo(), outStockBill.getFInterID());
                if (!erpService.haveReadOutBill(outStockBill.getFBillNo(),outStockBill.getFInterID(),-1)) {
                    log.error("更新出库通知单读取状态为-1失败[FBrNo={},FInterID={}]", outStockBill.getFBrNo(),outStockBill.getFInterID());
                }

 src/main/resources/application.yml

@@ -45,7 +45,7 @@
erp:
  db:
    driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    ur: jdbc:sqlserver://192.168.4.23:1433;databasename=xtyasrs_dual
    ur: jdbc:sqlserver://192.168.0.253:1433;databasename=xtyasrs_dual
    #    ur: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs_dual
    username: sa
    password: sa@123

 src/main/resources/mapper/OutStockMapper.xml

@@ -91,7 +91,7 @@
        a.FOrderInterID,a.FAuxQty,a.FCommitQty,a.FAuxPrice,a.FDate,a.FNote, a.Fnumber, a.FSourceBillNo, b.FBillNo,
        b.FAdd
        from OutStockBillEntry a left join OutStockBill b on a.FInterID = b.FInterID
        where b.FBillNo = #{FBillNo}) t where 1 = 1
        where b.FBillNo = #{FBillNo} and b.Fflag_finish != 1 and a.FQty > a.FAmount) t where 1 = 1
    </select>

    <select id="queryMatWithLoc" resultMap="BaseResultMap">
@@ -100,8 +100,8 @@
        and b.loc_sts = 'F'
        and a.matnr = #{matnr}
        order by
        DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time)
        desc,
        DATEPART(yyyy,a.appe_time),DATEPART(mm,a.appe_time),DATEPART(dd,a.appe_time)
        ASC,
        case
        when (left(a.loc_no, 2) = '01') then 0
        when (left(a.loc_no, 2) = '02') then 1