|
|
02b8a5fca5
|
update 到货单入库，增加SAP过账，QMS过账功能
|
2025-05-16 09:00:08 +08:00 |
|
|
|
5b6665cab1
|
fix:修改数据清空问题
|
2025-05-15 20:00:24 +08:00 |
|
王帅
|
2146620d74
|
销售退货
|
2025-05-15 19:44:03 +08:00 |
|
|
|
72b3c89815
|
fix:修改状态方法
|
2025-05-15 19:30:25 +08:00 |
|
|
|
4504b4cec4
|
add:添加采购退用单据批次过账
|
2025-05-15 18:06:31 +08:00 |
|
王帅
|
48c65aae69
|
销售退货根据接收仓库修改状态
|
2025-05-15 16:43:07 +08:00 |
|
|
|
e26517807f
|
update 二次确认物料出库请求接口，增加SAP报错回滚
|
2025-05-15 13:59:25 +08:00 |
|
|
|
76061c6a2b
|
Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr
|
2025-05-15 13:46:06 +08:00 |
|
|
|
823009d83d
|
fix：修改辅材拆分问题
|
2025-05-15 13:44:59 +08:00 |
|
王帅
|
a0d1bd69cf
|
是否恒温恒湿、是否熟化由Y改为01
|
2025-05-15 09:51:44 +08:00 |
|
|
|
986382f077
|
Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr
# Conflicts:
# zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java
|
2025-05-14 20:18:39 +08:00 |
|
|
|
3939da2117
|
fix：拆分
|
2025-05-14 20:16:52 +08:00 |
|
|
|
92a4276e31
|
update 手动入库时，取消CBT的IF判断
|
2025-05-14 20:11:00 +08:00 |
|
|
|
f3b5f88608
|
Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr
|
2025-05-14 15:21:22 +08:00 |
|
|
|
b25e52d74d
|
fix:mes下发失败,sap过账冲销
|
2025-05-14 15:21:16 +08:00 |
|
|
|
7791eec611
|
update MES-物料消耗请求接口，匹配工单未补0000，和补0000两种
|
2025-05-14 15:10:14 +08:00 |
|
|
|
3668e489a2
|
update 备货出库，出库按钮优化
|
2025-05-14 13:40:36 +08:00 |
|
|
|
eab3db5fdb
|
Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr
# Conflicts:
# zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java
|
2025-05-14 13:09:06 +08:00 |
|
|
|
4a7330f5f8
|
fix:修改过账冲销
|
2025-05-14 13:08:41 +08:00 |
|
|
|
5cd5ee8d07
|
update 备货出库，出库按钮增加现场仓
|
2025-05-14 11:54:57 +08:00 |
|
|
|
08ac09c914
|
update 取消物料入库请求,删除BS_MES_SHIPPED记录，条码取值
|
2025-05-14 11:19:39 +08:00 |
|
|
|
824ade1e4a
|
update 取消物料入库请求,修复未删除BS_MES_SHIPPED记录，导致取消后再次入库提示重复问题
|
2025-05-14 10:59:42 +08:00 |
|
|
|
1666603fa1
|
Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr
|
2025-05-14 08:46:04 +08:00 |
|
|
|
c6e5531b64
|
fix:修改委外
|
2025-05-14 08:45:56 +08:00 |
|
|
|
b333d2ba03
|
update 修改生产补料、生产领料、调拨出库、销售出库的事件名
|
2025-05-13 20:50:43 +08:00 |
|
|
|
66b59eaa8e
|
fix：修改备货出库
|
2025-05-13 19:28:15 +08:00 |
|
|
|
05516ac61c
|
update 二次确认物料出库请求接口，过账成功后，将条码状态由StockPending更新为Stocked
|
2025-05-13 16:11:11 +08:00 |
|
|
|
20d2decb4c
|
Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr
|
2025-05-13 15:26:48 +08:00 |
|
|
|
9f5c8cb04d
|
fix:修改问题
|
2025-05-13 15:26:41 +08:00 |
|
王帅
|
bfbfbbbdc3
|
成本中心，盘点审核
|
2025-05-13 15:26:39 +08:00 |
|
|
|
4df4664fac
|
update 二次确认物料出库请求接口/meswms_materialout_request，增加必填字段判空
|
2025-05-13 14:27:54 +08:00 |
|
|
|
e62be693e1
|
update 二次确认物料出库请求接口/meswms_materialout_request，增加payMentDate字段过账时间
|
2025-05-13 14:08:47 +08:00 |
|
|
|
e8e1635248
|
update 备货出库，点击出库按钮，需要二次确认，更新标签状态为StockPending。
|
2025-05-13 11:07:35 +08:00 |
|
|
|
ff6484dcae
|
Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr
|
2025-05-13 10:59:09 +08:00 |
|
|
|
016af18df6
|
fix:修改qms字段
|
2025-05-13 10:58:10 +08:00 |
|
|
|
1623d00256
|
update 备货出库页面，查询MES工单
|
2025-05-12 20:01:41 +08:00 |
|
|
|
a3cf3bf9b3
|
update 备货出库页面，查询MES工单维护表信息时截取工单字段的值
|
2025-05-12 19:57:07 +08:00 |
|
|
|
893e9720ee
|
update 备货出库页面，修改查询MES工单维护表信息SQL
|
2025-05-12 19:27:19 +08:00 |
|
|
|
bf1552a0bd
|
Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr
|
2025-05-12 17:44:44 +08:00 |
|
|
|
42f52b9c4e
|
添加 报废
|
2025-05-12 17:44:37 +08:00 |
|
|
|
ad89401f68
|
update 批次入库页面，入库按钮，修改调用QMS接口成功后的逻辑，解决重复产生入库记录数据问题
|
2025-05-12 15:24:55 +08:00 |
|
|
|
fefcf3a717
|
update 二次确认物料出库请求接口修改/meswms_materialout_request，增加lotName字段(条码的主键)
|
2025-05-12 13:27:57 +08:00 |
|
|
|
2ea3042bda
|
update 备货出库，出库按钮修改，增加是否调用MES二次确认物料出库接口
|
2025-05-12 13:27:04 +08:00 |
|
|
|
8e29bdb184
|
fix:修改成品入库创建标签
|
2025-05-10 16:57:01 +08:00 |
|
|
|
73cd81d64d
|
Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr
|
2025-05-09 16:55:42 +08:00 |
|
|
|
9bfb0a28b9
|
add SAP->WMS物料消耗，新增sapwms_materialconsume_request接口
|
2025-05-09 16:56:17 +08:00 |
|
|
|
8587d23b6a
|
fix:质检状态类型1时自动转仓逻辑更改
|
2025-05-09 16:55:35 +08:00 |
|
|
|
0d9de3c5ce
|
Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr
|
2025-05-09 10:50:59 +08:00 |
|
|
|
e5cf1e8bf7
|
fix:修改成本中心退料入库
|
2025-05-09 10:50:53 +08:00 |
|
|
|
8f5ce2eda2
|
update MES物料入库请求接口,1.增加stockInType='CBT'的业务处理2.BS_MES_SHIPPED表新增shipRequestName、shipRequestDetailName字段，并更新
|
2025-05-08 19:20:54 +08:00 |
|
