-
# Conflicts: # src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java # src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java # src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java # src/main/java/com/huaheng/pc/u8/service/ICSReceiptAPIService.java
-
使用reference_code关联。
-
# Conflicts: # src/main/java/com/huaheng/pc/u8/service/ICSReceiptAPIService.java
-
# Conflicts: # src/main/java/com/huaheng/api/wcs/controller/EmptyContainerController.java # src/main/resources/static/huaheng/js/huahengUI.js
-
# Conflicts: # .gitignore # .idea/misc.xml # .idea/workspace.xml # huaheng.iml
-
Conflicts: src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java src/main/java/com/huaheng/pc/receipt/receiving/controller/ReceivingController.java src/main/java/com/huaheng/pc/receipt/receiving/service/ReceivingService.java src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml src/main/resources/templates/config/material/material.html
