对接

zhang

2025-10-13 8050285fdb292d324d36b44f112b287214a0a573

对接

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -1008,6 +1008,7 @@
        Mat mat = matService.selectByMatnr(barcode1.getItemnumber());
        mat.setAnfme(barcode1.getQty());
        mat.setBc(barcode);
        mat.setBatch(barcode1.getBatchno());
        return R.ok(mat);
    }


 src/main/java/com/zy/asrs/entity/Mat.java

@@ -31,6 +31,9 @@


    @TableField(exist = false)
    private String batch;

    @TableField(exist = false)
    private String bc;



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

@@ -81,6 +81,9 @@
    @Override
    @Transactional
    public void comb(CombParam param, Long userId, String fxId) {
        if (Cools.isEmpty(fxId)){
            throw new CoolException("请用自己的账号组托");
        }
        if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
            throw new CoolException(BaseRes.PARAM);
        }
@@ -89,6 +92,7 @@
                eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
            throw new CoolException(param.getBarcode() + "数据组托档中已存在");
        }


        int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
        int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
@@ -105,26 +109,26 @@
        Date now = new Date();

        //进行批号筛选，批号只能唯一
        Set<String> batchs = new HashSet<>();
        List<String> strings = new ArrayList<>();
//        Set<String> batchs = new HashSet<>();
//        List<String> strings = new ArrayList<>();


        for (CombParam.CombMat mat : param.getCombMats()) {
            if (Cools.isEmpty(mat.getBatch())) {
                continue;
            }
            batchs.add(mat.getBatch());
            strings.add(mat.getBatch());
            WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("batch", mat.getBatch()));
            WrkDetl batch = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", mat.getBatch()));
            LocDetl batch1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", mat.getBatch()));
            if (!Cools.isEmpty(batch) || !Cools.isEmpty(batch1) || !Cools.isEmpty(waitPakin)) {
                throw new CoolException("该物料批号" + mat.getBatch() + "已在入库通知档、任务明细和库存中存在");
            }
        }
        if (batchs.size() < strings.size()) {
            throw new CoolException("有重复的物料批号");
        }
//        for (CombParam.CombMat mat : param.getCombMats()) {
//            if (Cools.isEmpty(mat.getBatch())) {
//                continue;
//            }
//            batchs.add(mat.getBatch());
//            strings.add(mat.getBatch());
//            WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("batch", mat.getBatch()));
//            WrkDetl batch = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", mat.getBatch()));
//            LocDetl batch1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", mat.getBatch()));
//            if (!Cools.isEmpty(batch) || !Cools.isEmpty(batch1) || !Cools.isEmpty(waitPakin)) {
//                throw new CoolException("该物料批号" + mat.getBatch() + "已在入库通知档、任务明细和库存中存在");
//            }
//        }
//        if (batchs.size() < strings.size()) {
//            throw new CoolException("有重复的物料批号");
//        }
        int i = 1;
        // 无单组托
        if (Cools.isEmpty(param.getOrderNo())) {
@@ -132,6 +136,12 @@
            // 生成入库通知档
            List<DetlDto> detlDtos = new ArrayList<>();
            param.getCombMats().forEach(elem -> {
                // 判断是否有相同条码的数据
                if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
                        eq("three_code", elem.getBc())) > 0) {
                    throw new CoolException( elem.getBc() + "数据组托档中已存在");
                }

                DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
                detlDto.setBc(elem.getBc());
                if (DetlDto.has(detlDtos, detlDto)) {

 src/main/resources/application.yml

@@ -33,12 +33,12 @@
    #    password: root
    #driver-class-name: com.mysql.cj.jdbc.Driver
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    jdbc-url: jdbc:sqlserver://192.168.3.148:1433;databasename=wms_middle
    username: wms
    password: wms@aunde
#    jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
#    username: sa
#    password: sa@123
#    jdbc-url: jdbc:sqlserver://192.168.3.148:1433;databasename=wms_middle
#    username: wms
#    password: wms@aunde
    jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=wms_middle
    username: sa
    password: sa@123

mybatis-plus:
  mapper-locations: classpath:mapper/*.xml 

 src/main/resources/mapper/asrs/OrderDetlMapper.xml

@@ -203,12 +203,12 @@
    <update id="increaseWorkQty2">
        update man_order_detl
        set work_qty = work_qty + #{workQty}
        <if test="color!=null and color!='' ">
            , color = #{color}
        </if>
        where 1=1
        and order_id = #{orderId}
        and matnr = #{matnr}
        <if test="color!=null and color!='' ">
            and color = #{color}
        </if>
        <choose>
            <when test="batch != null and batch != ''">
                and batch = #{batch}

 src/main/resources/mapper/third/ExdMaterialMapper.xml

@@ -30,13 +30,13 @@
    </select>

    <select id="getBacode" resultType="com.zy.third.entity.ExdvYanbu" parameterType="string">
                SELECT top 1 *
        FROM [Textile].[trade].[TianfuQcResult]
        where Barcode = #{barcode}
        <!-- SELECT top 1 *
        FROM ExdV_Yanbu
      FROM [Textile].[trade].[TianfuQcResult]
      where Barcode = #{barcode}  -->
    SELECT top 1 *
      FROM TianfuQcResult
        where Barcode = #{barcode}
        -->

    </select>

</mapper>