自动化立体仓库 - WMS系统
zwl
2 天以前 73f677ac03ebcf0f9d2e865dd60d3e4a6c2bc2c9
电视机出库订单托数显示
4个文件已修改
22 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/OpenService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/sql/20260421_inbound_camera_capture.sql 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -528,6 +528,7 @@
     */
    @PostMapping("/outOrder")
    public synchronized R outOrder(@RequestBody ArrayList<OutTaskParam> params, HttpServletRequest request) {
        int count = params.size();
        if (Cools.isEmpty(params)) {
            return R.error("请求参数不能为空");
        }
@@ -645,7 +646,7 @@
            return R.error("没有找到托盘码对应库位:" + String.join(",", badPalletIds)).add(missingLoc);
        }
        return openService.outOrderBatch(linesByBatchSeq);
        return openService.outOrderBatch(linesByBatchSeq,count);
    }
    /**
src/main/java/com/zy/asrs/service/OpenService.java
@@ -91,7 +91,7 @@
    /**
     * 7.11 出库通知单(传递有序无序规则)批量建单,同一事务:任一行失败则全部回滚。
     */
    R outOrderBatch(Map<String, List<OutTaskParam>> linesByBatchSeq);
    R outOrderBatch(Map<String, List<OutTaskParam>> linesByBatchSeq,int count);
    /**
     * 7.9 出库异常变动上报
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -1627,7 +1627,7 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R outOrderBatch(Map<String, List<OutTaskParam>> linesByBatchSeq) {
    public R outOrderBatch(Map<String, List<OutTaskParam>> linesByBatchSeq,int count) {
        int i = 0;
        for (Map.Entry<String, List<OutTaskParam>> entry : linesByBatchSeq.entrySet()) {
            for (OutTaskParam outTaskParam : entry.getValue()) {
@@ -1636,7 +1636,6 @@
                }else{
                    i++;
                }
                int count = entry.getValue().size();
                int teu = outTaskParam.getTeu();
                R r = outOrder(outTaskParam, count, teu ,i);
                if (!Objects.equals(r.get("code"), 200)) {
src/main/resources/sql/20260421_inbound_camera_capture.sql
@@ -25,9 +25,21 @@
    VALUES (
        N'入库站点抓拍配置',
        N'InboundCameraCapture',
        N'{"enabled":true,"captureUrl":"http://192.168.10.11:8000/startPic","imageUrlPrefix":"http://192.168.10.11:8000/image/","stations":{"101":[{"ip":"10.10.16.13","port":554,"user":"admin","password":"a327482030"},{"ip":"10.10.16.14","port":554,"user":"admin","password":"a327482030"}]}}',
        N'{"enabled":true,"captureUrl":"http://192.168.160.11:8000/startPic","imageUrlPrefix":"http://192.168.160.11/","stations":{"101":[{"ip":"10.10.16.13","port":554,"user":"admin","password":"a327482030"},{"ip":"10.10.16.14","port":554,"user":"admin","password":"a327482030"}]}}',
        2,
        1
    );
END
GO
UPDATE sys_config
SET value = REPLACE(value, N'"captureUrl":"http://192.168.10.11:8000/startPic"', N'"captureUrl":"http://192.168.160.11:8000/startPic"')
WHERE code = N'InboundCameraCapture'
  AND value LIKE N'%"captureUrl":"http://192.168.10.11:8000/startPic"%';
GO
UPDATE sys_config
SET value = REPLACE(value, N'"imageUrlPrefix":"http://192.168.10.11:8000/image/"', N'"imageUrlPrefix":"http://192.168.160.11/"')
WHERE code = N'InboundCameraCapture'
  AND value LIKE N'%"imageUrlPrefix":"http://192.168.10.11:8000/image/"%';
GO