wms / wms_tianjinggelinmei · Commits

# Conflicts:
#	src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java

完善客户接口地址信息。

出库单详情新增原料批号字段
新增mes回传字段

# Conflicts:
#	src/main/java/com/huaheng/framework/shiro/web/filter/online/OnlineSessionFilter.java

# Conflicts:
#	src/main/resources/templates/receipt/receiptDetail/edit.html

# Conflicts:
#	src/main/resources/templates/receipt/receiptDetail/edit.html