From b899d2388df844378ff6f2c495febf09447d954d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 27 十二月 2024 19:51:39 +0800
Subject: [PATCH] #问题修复 # 3.生成任务档作业中数量没变 4.合并订单生成任务，只生成了其中一个 5.103任务完成后，订单状态未修改 6.库位订数量未减少
---
zy-asrs-admin/src/components/orderDetlLog/show.vue | 2
zy-asrs-admin/src/components/orderLog/index.vue | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java | 8 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 7 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java | 2
zy-asrs-admin/src/views/in/waitPakin/index.vue | 4
zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml | 9 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java | 26 ++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java | 22 +++++++
zy-asrs-admin/src/components/orderDetl/edit.vue | 2
zy-asrs-admin/src/components/order/order/orderIn.vue | 2
zy-asrs-admin/src/components/orderDetl/show.vue | 2
zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue | 4
zy-asrs-admin/src/components/task/showTaskDetl/index.vue | 31 +++++-----
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java | 4 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/SowSeeds.java | 32 ++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java | 8 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedMapper.java | 7 ++
18 files changed, 147 insertions(+), 29 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/order/orderIn.vue b/zy-asrs-admin/src/components/order/order/orderIn.vue
index 7656045..ac26657 100644
--- a/zy-asrs-admin/src/components/order/order/orderIn.vue
+++ b/zy-asrs-admin/src/components/order/order/orderIn.vue
@@ -50,7 +50,7 @@
{
title: formatMessage('db.man_order.order_no', '璁㈠崟缂栧彿'),
dataIndex: 'orderNo',
- width: 200,
+ width: 230,
ellipsis: true,
...getColumnSearchProps('orderNo'),
},
diff --git a/zy-asrs-admin/src/components/orderDetl/edit.vue b/zy-asrs-admin/src/components/orderDetl/edit.vue
index 8d53cc7..cc22e0a 100644
--- a/zy-asrs-admin/src/components/orderDetl/edit.vue
+++ b/zy-asrs-admin/src/components/orderDetl/edit.vue
@@ -39,7 +39,7 @@
{
title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
- width: 140,
+ width: 200,
ellipsis: true,
},
{
diff --git a/zy-asrs-admin/src/components/orderDetl/show.vue b/zy-asrs-admin/src/components/orderDetl/show.vue
index 9d7dddd..0b5c321 100644
--- a/zy-asrs-admin/src/components/orderDetl/show.vue
+++ b/zy-asrs-admin/src/components/orderDetl/show.vue
@@ -50,7 +50,7 @@
{
title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
- width: 140,
+ width: 200,
ellipsis: true,
},
{
diff --git a/zy-asrs-admin/src/components/orderDetlLog/show.vue b/zy-asrs-admin/src/components/orderDetlLog/show.vue
index 71785c2..3fee689 100644
--- a/zy-asrs-admin/src/components/orderDetlLog/show.vue
+++ b/zy-asrs-admin/src/components/orderDetlLog/show.vue
@@ -44,7 +44,7 @@
{
title: formatMessage('db.man_loc_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
- width: 140,
+ width: 180,
ellipsis: true,
},
{
diff --git a/zy-asrs-admin/src/components/orderLog/index.vue b/zy-asrs-admin/src/components/orderLog/index.vue
index 7ffd4f1..227aab7 100644
--- a/zy-asrs-admin/src/components/orderLog/index.vue
+++ b/zy-asrs-admin/src/components/orderLog/index.vue
@@ -45,14 +45,14 @@
{
title: formatMessage('db.man_order.order_no', '璁㈠崟缂栧彿'),
dataIndex: 'orderNo',
- width: 140,
+ width: 230,
ellipsis: true,
...getColumnSearchProps('orderNo'),
},
{
title: formatMessage('db.man_order.order_time', '鍗曟嵁鏃ユ湡'),
dataIndex: 'orderTime',
- width: 140,
+ width: 180,
ellipsis: true,
...getColumnSearchProps('orderTime'),
},
diff --git a/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue b/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
index 1da40d9..909eae0 100644
--- a/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
+++ b/zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
@@ -44,7 +44,7 @@
{
title: formatMessage('db.man_order_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: 'matnr',
- width: 140,
+ width: 180,
ellipsis: true,
...getColumnSearchProps('matnr'),
customCell: (_, index) => {
@@ -54,7 +54,7 @@
{
title: formatMessage('db.man_order_detl.batch', '鎵瑰彿'),
dataIndex: 'batch',
- width: 140,
+ width: 110,
ellipsis: true,
...getColumnSearchProps('batch'),
customCell: (_, index) => {
diff --git a/zy-asrs-admin/src/components/task/showTaskDetl/index.vue b/zy-asrs-admin/src/components/task/showTaskDetl/index.vue
index 532b599..7be1201 100644
--- a/zy-asrs-admin/src/components/task/showTaskDetl/index.vue
+++ b/zy-asrs-admin/src/components/task/showTaskDetl/index.vue
@@ -53,8 +53,22 @@
{
title: formatMessage('db.man_task_detl.matnr', '鍟嗗搧缂栧彿'),
dataIndex: ['mat$', 'matnr'],
- width: 140,
+ width: 200,
ellipsis: true,
+ },
+ {
+ title: formatMessage('db.man_task_detl.order_no', '璁㈠崟缂栧彿'),
+ dataIndex: 'orderNo',
+ width: 230,
+ ellipsis: true,
+ ...getColumnSearchProps('orderNo'),
+ },
+ {
+ title: formatMessage('db.man_task_detl.wave_no', '娉㈡缂栧彿'),
+ dataIndex: ['wave$', 'waveNo'],
+ width: 180,
+ ellipsis: true,
+ ...getColumnSearchProps('waveNo'),
},
{
title: formatMessage('db.man_task_detl.maktx', '鍟嗗搧鍚嶇О'),
@@ -90,20 +104,7 @@
ellipsis: true,
...getColumnSearchProps('barcode'),
},
- {
- title: formatMessage('db.man_task_detl.order_no', '璁㈠崟缂栧彿'),
- dataIndex: 'orderNo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('orderNo'),
- },
- {
- title: formatMessage('db.man_task_detl.wave_no', '娉㈡缂栧彿'),
- dataIndex: ['wave$', 'waveNo'],
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('waveNo'),
- },
+
];
const fieldList = [];
diff --git a/zy-asrs-admin/src/views/in/waitPakin/index.vue b/zy-asrs-admin/src/views/in/waitPakin/index.vue
index 8df3a82..0670ce9 100644
--- a/zy-asrs-admin/src/views/in/waitPakin/index.vue
+++ b/zy-asrs-admin/src/views/in/waitPakin/index.vue
@@ -49,14 +49,14 @@
{
title: formatMessage('db.man_wait_pakin.order_id', '璁㈠崟ID'),
dataIndex: 'orderId$',
- width: 140,
+ width: 100,
ellipsis: true,
...getColumnSearchProps('orderId$'),
},
{
title: formatMessage('db.man_wait_pakin.order_no', '璁㈠崟缂栧彿'),
dataIndex: 'orderNo',
- width: 140,
+ width: 230,
ellipsis: true,
...getColumnSearchProps('orderNo'),
},
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
new file mode 100644
index 0000000..93705e1
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/controller/WaveManagentController.java
@@ -0,0 +1,26 @@
+package com.zy.asrs.wms.apis.wcs.controller;
+
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
+import com.zy.asrs.wms.system.controller.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/wave")
+public class WaveManagentController extends BaseController {
+
+ @Autowired
+ private WaveManagentService waveManagentService;
+
+ /***
+ * 鑾峰彇澶勪簬鎾鐘舵�佺殑浠诲姟鍗曟嵁
+ * @return
+ */
+ @GetMapping("/sow/seeds")
+ public R sowSeeds() {
+ return waveManagentService.getSowSeeds();
+ }
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/SowSeeds.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/SowSeeds.java
new file mode 100644
index 0000000..3c16340
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/entity/response/SowSeeds.java
@@ -0,0 +1,32 @@
+package com.zy.asrs.wms.apis.wcs.entity.response;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@Accessors(chain = true)
+public class SowSeeds implements Serializable {
+
+// private String siteId;
+
+ private String siteNo;
+
+ private String orderNo;
+
+ private String matnr;
+
+ private Long workQty;
+
+ private Long anfme;
+
+ private String batch;
+
+ private String createTime;
+
+ private String createBy;
+
+ private String memo;
+
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
new file mode 100644
index 0000000..004a0a9
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/Impl/WaveManagentServiceImpl.java
@@ -0,0 +1,22 @@
+package com.zy.asrs.wms.apis.wcs.services.Impl;
+
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
+import com.zy.asrs.wms.apis.wcs.services.WaveManagentService;
+import com.zy.asrs.wms.asrs.service.WaveSeedService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class WaveManagentServiceImpl implements WaveManagentService {
+ @Autowired
+ private WaveSeedService waveSeedService;
+
+ @Override
+ public R getSowSeeds() {
+ List<SowSeeds> waveSeeds = waveSeedService.selectSeedsList();
+ return R.ok(waveSeeds);
+ }
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
new file mode 100644
index 0000000..cf1270d
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/apis/wcs/services/WaveManagentService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.wms.apis.wcs.services;
+
+
+import com.zy.asrs.framework.common.R;
+
+public interface WaveManagentService {
+ R getSowSeeds();
+}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
index aafec91..afc4f30 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
@@ -66,9 +66,9 @@
if (!(order.getOrderType() == 1)) {
return R.error("闈炲叆搴撹鍗曪紝 涓嶅彲鎿嶄綔锛侊紒");
}
- if (order.getOrderSettle() > 2) {
- return R.error("鍗曟嵁褰撳墠鐘舵�佷笉鍙仛鍏ュ簱鎿嶄綔锛侊紒");
- }
+// if (order.getOrderSettle() > 2) {
+// return R.error("鍗曟嵁褰撳墠鐘舵�佷笉鍙仛鍏ュ簱鎿嶄綔锛侊紒");
+// }
List<OrderInfoDto> orders = orderService.getDetlForOrderId(order.getId());
return R.ok(orders);
@@ -140,4 +140,5 @@
return R.ok("缁勬墭澶辫触锛侊紒");
}
}
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
index eca5a1f..d497908 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/OrderDetl.java
@@ -184,7 +184,7 @@
public Double getWaitQty(){
Double qty = 0D;
WaitPakinService service = SpringUtils.getBean(WaitPakinService.class);
- List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id));
+ List<WaitPakin> waitPakins = service.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getDetlId, id).eq(WaitPakin::getIoStatus, 0));
for (WaitPakin waitPakin : waitPakins) {
qty += waitPakin.getAnfme();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedMapper.java
index c8b712d..cc90094 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedMapper.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/WaveSeedMapper.java
@@ -1,12 +1,19 @@
package com.zy.asrs.wms.asrs.mapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
+
+import java.util.List;
@Mapper
@Repository
public interface WaveSeedMapper extends BaseMapper<WaveSeed> {
+ List<SowSeeds> getSeedsList(@Param(Constants.WRAPPER) LambdaQueryWrapper<WaveSeed> ew);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
index 0160ada..8d92108 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WaveSeedService.java
@@ -1,11 +1,15 @@
package com.zy.asrs.wms.asrs.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
+
+import java.util.List;
public interface WaveSeedService extends IService<WaveSeed> {
void waveSeedReview(WaveSeedReviewParam param);
+ List<SowSeeds> selectSeedsList();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
index e9258ca..e3317d3 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WaveSeedServiceImpl.java
@@ -1,6 +1,8 @@
package com.zy.asrs.wms.asrs.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.exception.CoolException;
+import com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds;
import com.zy.asrs.wms.asrs.entity.param.WaveSeedReviewParam;
import com.zy.asrs.wms.asrs.mapper.WaveSeedMapper;
import com.zy.asrs.wms.asrs.entity.WaveSeed;
@@ -9,6 +11,7 @@
import org.springframework.stereotype.Service;
import java.util.Date;
+import java.util.List;
import java.util.Optional;
@Service("waveSeedService")
@@ -48,4 +51,9 @@
throw new CoolException("鎾澶嶆牳鏇存柊澶辫触");
}
}
+
+ @Override
+ public List<SowSeeds> selectSeedsList() {
+ return this.baseMapper.getSeedsList(new LambdaQueryWrapper<WaveSeed>().eq(WaveSeed::getStatus, 1));
+ }
}
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml
index 48aeaab..13081b1 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml
+++ b/zy-asrs-wms/src/main/resources/mapper/asrs/WaveSeedMapper.xml
@@ -2,4 +2,13 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.wms.asrs.mapper.WaveSeedMapper">
+<!-- waveLabels: {siteId: '绔欑偣鏍囪瘑', siteNo: '绔欑偣缂栧彿', orderNo: '璁㈠崟缂栧彿', matnr: '鍟嗗搧缂栧彿', workQty: '澶嶆牳鏁伴噺', anfme: '鏁伴噺' ,batch: '鎵瑰彿', createTime$: '娣诲姞鏃堕棿', createBy$: '娣诲姞浜哄憳', memo: '澶囨敞' },-->
+
+ <select id="getSeedsList" resultType="com.zy.asrs.wms.apis.wcs.entity.response.SowSeeds">
+ SELECT
+ *
+ FROM
+ ( SELECT site_id, site_no, order_no, anfme, work_qty, matnr, batch, create_time, `status`, create_by, memo FROM man_wave_seed ) t
+ ${ew.customSqlSegment}
+ </select>
</mapper>
--
Gitblit v1.9.1