Commit Graph

17 Commits

Author SHA1 Message Date
zhangzhiqiang
88c6ad2d37 opt:刻字输送线任务下发控制 2023-09-13 18:33:59 +08:00
zhangzhiqiang
172ec8692c add:添加一体机批量入库/组盘 2023-08-04 14:23:32 +08:00
zhangzhiqiang
4edcab8b9e rev:出库修改 2023-07-27 11:22:23 +08:00
zhangzhiqiang
373488ada2 add:新增半成品出入库导入/清洗刻字调度任务 2023-07-25 17:08:37 +08:00
2038cf1fe4 Merge remote-tracking branch 'origin/master' 2023-07-17 16:33:31 +08:00
4a0a36c091 rev:根据实际排产场景,修改销售订单内容 2023-07-17 16:29:29 +08:00
zhouz
76ff2a41ec Merge branch 'master' of http://121.40.234.130:8899/root/hl_one
# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/controller/customer/MdCsCustomerbaseController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/master/service/classstandard/impl/MdPbClassstandardServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/IMdMeMaterialbaseService.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/service/material/impl/MdMeMaterialbaseServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/masterdata_manage/备份master/service/impl/MaterialbaseServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/controller/productProcessRoute/ProductprocessrouteController.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/processroute/impl/PdmBiProcessrouteServiceImpl.java
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/productProcessRoute/impl/PdmBiProductprocessrouteServiceImpl.java
#	mes/qd/src/api/wms/basedata/master/customerbase.js
2023-07-17 15:35:42 +08:00
zhouz
ffe29d6d4d rev:新增导入相关功能 2023-07-17 11:28:11 +08:00
zhangzhiqiang
586436419b rev:结构变更 2023-07-09 10:21:13 +08:00
e233f01bec add:排产相关功能。 rev:修改工单管理,销售订单管理,工厂日历功能;
add:排产相关功能。
rev:修改工单管理,销售订单管理,工厂日历功能;
2023-07-05 16:00:55 +08:00
ludj
3b4485f945 rev: 界面样式修改 2023-06-30 15:57:32 +08:00
zhouz
f37b0afe88 rev:新增原料需求功能 2023-06-30 10:23:26 +08:00
zhouz
7b360a1743 rev:新增原材料需求功能 2023-06-29 18:35:44 +08:00
zhangzhiqiang
729f61216a rev:成品入库 2023-04-14 11:13:56 +08:00
f9f66b0528 修改 2023-03-24 16:57:57 +08:00
ldj_willow
86117a04ee 代码修改 2022-08-27 10:54:25 +08:00
8bc7f54bbc init 2022-06-27 19:25:41 +08:00