297 Commits

Author SHA1 Message Date
王帅
1bf40df886 货位信息功能调整 2025-05-21 09:48:26 +08:00
王帅
792d0ebfc1 仓库信息编辑 2025-05-20 18:09:42 +08:00
5ef45cc258 update 物料主数据接口,修改是否质检更新的表 2025-05-20 16:06:46 +08:00
王帅
82838a03be 业主审核添加过账时间 2025-05-20 16:00:37 +08:00
王帅
b6a0c7c86d 业助更新 2025-05-20 15:28:32 +08:00
3e0fbfd3b0 Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr 2025-05-20 14:54:58 +08:00
8e12d3400b fix:修改拆分 2025-05-20 14:54:52 +08:00
7bbf052b99 update 到货单入库按钮,增加更新入库单数量 2025-05-20 14:21:46 +08:00
7ed15cee23 update SAP消耗/冲销返回信息修改 2025-05-20 09:28:05 +08:00
a813f2bbc5 update 到货单入库过账优化 2025-05-19 20:17:37 +08:00
e860f248fe fix:添加拆分 2025-05-19 19:48:17 +08:00
6a9b526fed fix:修改e库存 2025-05-19 19:36:43 +08:00
e2e25a1e39 Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr 2025-05-19 17:58:09 +08:00
c1a212376a add:新增业助功能 2025-05-19 17:58:03 +08:00
c448c21e48 add 接收物料组质检周期接口 2025-05-19 16:52:45 +08:00
50e77ee9a8 update SAP物料主数据下发接口,新增启用批次、是否质检字段与功能 2025-05-19 14:20:44 +08:00
王帅
e3af010d39 产成品入库,添加 box 2025-05-19 10:57:14 +08:00
王帅
523b88391a 销售退货(pda)入库清除shiprequestname栏位 2025-05-19 10:17:27 +08:00
a3c5d53f38 Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-svr 2025-05-19 09:06:14 +08:00
2cb223ad71 fix:修改退料入库 2025-05-19 09:06:07 +08:00
王帅
c28d4205db 业助客户更新,审核 2025-05-19 09:00:43 +08:00
e51c4eea7f update MES物料消耗接口,修改SAP过账日期报文 2025-05-16 17:58:17 +08:00
136d0b16a4 update MES物料消耗接口,修改SAP过账日期报文 2025-05-16 17:57:34 +08:00
王帅
7176a2a3bf 复卷/返工订单可以领不良品和待检物料 2025-05-16 11:07:54 +08:00
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