wms / wms_ningxiangwanrong · Commits

Commit 8cf81d8545a221a8f4475f73ae14d0da14036515

Authored by mahuandong
1 parent 7a9a3f52

新增丢失文件

Inline Side-by-side
Showing 185 changed files with 24047 additions and 800 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 80 of 185 files are displayed.

.idea/workspace.xml
  View file @8cf81d8
... ... @@ -2,7 +2,194 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="29079676-ace5-434e-89a2-76a325e744a5" name="Default Changelist" comment="合并信义源码">
  5 + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java" afterDir="false" />
  6 + <change afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/shipment/Shipment.java" afterDir="false" />
  7 + <change afterPath="$PROJECT_DIR$/src/main/resources/application-dev.yml" afterDir="false" />
  8 + <change afterPath="$PROJECT_DIR$/src/main/resources/application-prd.yml" afterDir="false" />
  9 + <change afterPath="$PROJECT_DIR$/src/main/resources/application.yml" afterDir="false" />
  10 + <change afterPath="$PROJECT_DIR$/src/main/resources/fonts/STSONG.TTF" afterDir="false" />
  11 + <change afterPath="$PROJECT_DIR$/src/main/resources/fonts/fonts.xml" afterDir="false" />
  12 + <change afterPath="$PROJECT_DIR$/src/main/resources/jaspers/mypage.jasper" afterDir="false" />
  13 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/check/CheckDetailMapper.xml" afterDir="false" />
  14 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/check/CheckHeaderMapper.xml" afterDir="false" />
  15 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/check/CheckingRegisterMapper.xml" afterDir="false" />
  16 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/AlarmLevelMapper.xml" afterDir="false" />
  17 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/BomHeaderMapper.xml" afterDir="false" />
  18 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/CarrierMapper.xml" afterDir="false" />
  19 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ConfigValueMapper.xml" afterDir="false" />
  20 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ConfigWarningMapper.xml" afterDir="false" />
  21 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerCapacityMapper.xml" afterDir="false" />
  22 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ContainerMapper.xml" afterDir="false" />
  23 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/CustomerMapper.xml" afterDir="false" />
  24 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ExcelTemplateMapper.xml" afterDir="false" />
  25 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/FilterConfigDetailMapper.xml" afterDir="false" />
  26 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/LocationMapper.xml" afterDir="false" />
  27 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialMapper.xml" afterDir="false" />
  28 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialMultipleMapper.xml" afterDir="false" />
  29 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/MaterialTypeMapper.xml" afterDir="false" />
  30 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ReceiptPreferenceMapper.xml" afterDir="false" />
  31 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/ReceiptTypeMapper.xml" afterDir="false" />
  32 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/SendMailMapper.xml" afterDir="false" />
  33 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/StationMapper.xml" afterDir="false" />
  34 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/StatusFlowDetailMapper.xml" afterDir="false" />
  35 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/SupplierMapper.xml" afterDir="false" />
  36 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/WarehouseMapper.xml" afterDir="false" />
  37 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/WaveFlowDetailMapper.xml" afterDir="false" />
  38 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/config/WcsscanbarcodeMapper.xml" afterDir="false" />
  39 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/AdjustDetailMapper.xml" afterDir="false" />
  40 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/inventory/CycleCountHeaderMapper.xml" afterDir="false" />
  41 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/monitor/JobLogMapper.xml" afterDir="false" />
  42 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/monitor/JobMapper.xml" afterDir="false" />
  43 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptDetailHistoryMapper.xml" afterDir="false" />
  44 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptHeaderHistoryMapper.xml" afterDir="false" />
  45 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentCombinationMapper.xml" afterDir="false" />
  46 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentDetailHistoryMapper.xml" afterDir="false" />
  47 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/ShipmentHeaderHistoryMapper.xml" afterDir="false" />
  48 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/shipment/WaveMapper.xml" afterDir="false" />
  49 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/system/SysUserWarehouseMapper.xml" afterDir="false" />
  50 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskHeaderMapper.xml" afterDir="false" />
  51 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/task/TaskPreferenceMapper.xml" afterDir="false" />
  52 + <change afterPath="$PROJECT_DIR$/src/main/resources/mybatis/xinyi/TokenMapper.xml" afterDir="false" />
  53 + <change afterPath="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap3-editable/img/loading.gif" afterDir="false" />
  54 + <change afterPath="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap3-editable/js/bootstrap-editable.js" afterDir="false" />
  55 + <change afterPath="$PROJECT_DIR$/src/main/resources/static/ajax/libs/bootstrap3-editable/js/bootstrap-editable.min.js" afterDir="false" />
  56 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/alarmLevel/add.html" afterDir="false" />
  57 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/alarmLevel/alarmLevel.html" afterDir="false" />
  58 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/alarmLevel/edit.html" afterDir="false" />
  59 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomDetail/bomDetail.html" afterDir="false" />
  60 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomDetail/edit.html" afterDir="false" />
  61 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/add.html" afterDir="false" />
  62 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/bomHeader.html" afterDir="false" />
  63 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/bomHeader/edit.html" afterDir="false" />
  64 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/carrier/add.html" afterDir="false" />
  65 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/carrier/edit.html" afterDir="false" />
  66 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/company/add.html" afterDir="false" />
  67 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/company/company.html" afterDir="false" />
  68 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/company/edit.html" afterDir="false" />
  69 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configValue/add.html" afterDir="false" />
  70 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configValue/edit.html" afterDir="false" />
  71 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configWarning/add.html" afterDir="false" />
  72 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configWarning/configWarning.html" afterDir="false" />
  73 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/configWarning/edit.html" afterDir="false" />
  74 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/container/add.html" afterDir="false" />
  75 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/container/container.html" afterDir="false" />
  76 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/container/edit.html" afterDir="false" />
  77 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/customer/customer.html" afterDir="false" />
  78 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/customer/edit.html" afterDir="false" />
  79 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/cycleCountPreference/edit.html" afterDir="false" />
  80 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/excelTemplate/excelTemplate.html" afterDir="false" />
  81 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigDetail/add.html" afterDir="false" />
  82 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigDetail/edit.html" afterDir="false" />
  83 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/edit.html" afterDir="false" />
  84 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/filterConfigHeader/filterConfigHeader.html" afterDir="false" />
  85 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/location/add.html" afterDir="false" />
  86 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/location/addBatch.html" afterDir="false" />
  87 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/location/edit.html" afterDir="false" />
  88 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/add.html" afterDir="false" />
  89 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/edit.html" afterDir="false" />
  90 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/material/material.html" afterDir="false" />
  91 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialMultiple/edit.html" afterDir="false" />
  92 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialMultiple/materialMultiple.html" afterDir="false" />
  93 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialType/add.html" afterDir="false" />
  94 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialType/materialType.html" afterDir="false" />
  95 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialUnit/add.html" afterDir="false" />
  96 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialUnit/edit.html" afterDir="false" />
  97 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/materialUnit/materialUnit.html" afterDir="false" />
  98 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/edit.html" afterDir="false" />
  99 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptPreference/receiptPreference.html" afterDir="false" />
  100 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/add.html" afterDir="false" />
  101 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/receiptType/receiptType.html" afterDir="false" />
  102 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentPreference/add.html" afterDir="false" />
  103 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentPreference/edit.html" afterDir="false" />
  104 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentPreference/shipmentPreference.html" afterDir="false" />
  105 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/edit.html" afterDir="false" />
  106 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/shipmentType/shipmentType.html" afterDir="false" />
  107 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowDetail/add.html" afterDir="false" />
  108 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowDetail/edit.html" afterDir="false" />
  109 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowDetail/statusFlowDetail.html" afterDir="false" />
  110 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/edit.html" afterDir="false" />
  111 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html" afterDir="false" />
  112 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/supplier/edit.html" afterDir="false" />
  113 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/warehouse/add.html" afterDir="false" />
  114 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/warehouse/copy.html" afterDir="false" />
  115 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/warehouse/edit.html" afterDir="false" />
  116 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveFlowHeader/add.html" afterDir="false" />
  117 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveFlowHeader/edit.html" afterDir="false" />
  118 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveFlowHeader/waveFlowHeader.html" afterDir="false" />
  119 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveMaster/add.html" afterDir="false" />
  120 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/config/waveMaster/waveMaster.html" afterDir="false" />
  121 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustDetail/add.html" afterDir="false" />
  122 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/adjustHeader.html" afterDir="false" />
  123 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/adjustHeader/report.html" afterDir="false" />
  124 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryDetail/inventoryDetail.html" afterDir="false" />
  125 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyCheckOut.html" afterDir="false" />
  126 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyContainer.html" afterDir="false" />
  127 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyIn.html" afterDir="false" />
  128 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/emptyOut.html" afterDir="false" />
  129 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/inventory/inventoryHeader/inventoryHeader.html" afterDir="false" />
  130 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentAnalyzeTemplate/shipmentAnalyzeTemplate.html" afterDir="false" />
  131 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/addWave.html" afterDir="false" />
  132 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/wave/add.html" afterDir="false" />
  133 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/wave/edit.html" afterDir="false" />
  134 + <change afterPath="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader/taskHeader.html" afterDir="false" />
  135 + <change afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/BatchCreated.java" afterDir="false" />
5 136 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
  137 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/HuaHengApplication.java" afterDir="false" />
  138 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/http/HttpUtils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/common/utils/http/HttpUtils.java" afterDir="false" />
  139 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/CompanyInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/CompanyInfo.java" afterDir="false" />
  140 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/MobileUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/general/MobileUserController.java" afterDir="false" />
  141 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventory.java" afterDir="false" />
  142 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java" afterDir="false" />
  143 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java" afterDir="false" />
  144 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/ReceiptBill.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/mobile/receipt/ReceiptBill.java" afterDir="false" />
  145 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyService.java" afterDir="false" />
  146 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java" afterDir="false" />
  147 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/controller/LocationController.java" afterDir="false" />
  148 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/domain/Location.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/domain/Location.java" afterDir="false" />
  149 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java" afterDir="false" />
  150 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationService.java" afterDir="false" />
  151 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java" afterDir="false" />
  152 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java" afterDir="false" />
  153 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialService.java" afterDir="false" />
  154 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java" afterDir="false" />
  155 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java" afterDir="false" />
  156 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java" afterDir="false" />
  157 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/mapper/WcsscanbarcodeMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/mapper/WcsscanbarcodeMapper.java" afterDir="false" />
  158 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/service/WcsscanbarcodeService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/config/wcsscanbarcode/service/WcsscanbarcodeService.java" afterDir="false" />
  159 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java" afterDir="false" />
  160 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java" afterDir="false" />
  161 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java" afterDir="false" />
  162 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java" afterDir="false" />
  163 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java" afterDir="false" />
  164 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java" afterDir="false" />
  165 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java" afterDir="false" />
  166 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java" afterDir="false" />
  167 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java" afterDir="false" />
  168 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java" afterDir="false" />
  169 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java" afterDir="false" />
  170 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java" afterDir="false" />
  171 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java" afterDir="false" />
  172 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java" afterDir="false" />
  173 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java" afterDir="false" />
  174 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java" afterDir="false" />
  175 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java" afterDir="false" />
  176 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/domain/Dept.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/system/dept/domain/Dept.java" afterDir="false" />
  177 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java" afterDir="false" />
  178 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java" afterDir="false" />
  179 + <change beforePath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java" afterDir="false" />
  180 + <change beforePath="$PROJECT_DIR$/src/main/resources/application-druid.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application-druid.properties" afterDir="false" />
  181 + <change beforePath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml" afterDir="false" />
  182 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/monitor/locationstatus/locationstatus.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/monitor/locationstatus/locationstatus.html" afterDir="false" />
  183 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/receipt/receiptHeader/receiptHeader.html" afterDir="false" />
  184 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentDetail/edit.html" afterDir="false" />
  185 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/add.html" afterDir="false" />
  186 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/shipment/shipmentHeader/edit.html" afterDir="false" />
  187 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/dept/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/dept/add.html" afterDir="false" />
  188 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/dept/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/dept/edit.html" afterDir="false" />
  189 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/menu/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/menu/add.html" afterDir="false" />
  190 + <change beforePath="$PROJECT_DIR$/src/main/resources/templates/system/user/add.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/system/user/add.html" afterDir="false" />
  191 + <change beforePath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/CreateCode.java" afterDir="false" />
  192 + <change beforePath="$PROJECT_DIR$/src/test/java/com.huaheng.test/EncryptPassword.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com.huaheng.test/EncryptPassword.java" afterDir="false" />
6 193 </list>
7 194 <option name="SHOW_DIALOG" value="false" />
8 195 <option name="HIGHLIGHT_CONFLICTS" value="true" />
... ... @@ -60,6 +247,7 @@
60 247 </map>
61 248 </option>
62 249 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
  250 + <option name="UPDATE_TYPE" value="MERGE" />
63 251 </component>
64 252 <component name="IgnoredFileRootStore">
65 253 <option name="generatedRoots">
... ... @@ -80,6 +268,7 @@
80 268 <component name="PropertiesComponent">
81 269 <property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
82 270 <property name="DatabaseDriversLRU" value="mysql" />
  271 + <property name="ExpandSpringBootJavaOptionsPanel" value="true" />
83 272 <property name="RequestMappingsPanelOrder0" value="0" />
84 273 <property name="RequestMappingsPanelOrder1" value="1" />
85 274 <property name="RequestMappingsPanelWidth0" value="75" />
... ... @@ -88,7 +277,8 @@
88 277 <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
89 278 <property name="WebServerToolWindowFactoryState" value="false" />
90 279 <property name="aspect.path.notification.shown" value="true" />
91   - <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/mybatis" />
  280 + <property name="ignore_missing_gitignore" value="true" />
  281 + <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/resources/templates/task/taskHeader" />
92 282 <property name="node.js.detected.package.eslint" value="true" />
93 283 <property name="node.js.detected.package.tslint" value="true" />
94 284 <property name="node.js.path.for.package.eslint" value="project" />
... ... @@ -98,6 +288,10 @@
98 288 <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
99 289 </component>
100 290 <component name="RecentsManager">
  291 + <key name="CopyFile.RECENT_KEYS">
  292 + <recent name="E:\code\wms2\src\main\resources\templates\task\taskHeader" />
  293 + <recent name="E:\code\wms2\src\main\resources\mybatis\monitor" />
  294 + </key>
101 295 <key name="MoveFile.RECENT_KEYS">
102 296 <recent name="E:\code\wms2\src\main\resources\mybatis\general" />
103 297 <recent name="E:\code\wms2\src\main\resources\mybatis\config" />
... ... @@ -105,7 +299,7 @@
105 299 </component>
106 300 <component name="RunManager">
107 301 <configuration name="HuaHengApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
108   - <module name="WMSV1" />
  302 + <module name="wms2" />
109 303 <option name="SPRING_BOOT_MAIN_CLASS" value="com.huaheng.HuaHengApplication" />
110 304 <option name="ALTERNATIVE_JRE_PATH" />
111 305 <option name="UPDATE_ACTION_UPDATE_POLICY" value="UpdateClassesAndResources" />
... ... @@ -153,6 +347,10 @@
153 347 <workItem from="1565328536669" duration="797000" />
154 348 <workItem from="1578550781950" duration="1941000" />
155 349 <workItem from="1578571901482" duration="717000" />
  350 + <workItem from="1580799270581" duration="22000" />
  351 + <workItem from="1580799464519" duration="19000" />
  352 + <workItem from="1581986427727" duration="2807000" />
  353 + <workItem from="1581990347840" duration="909000" />
156 354 </task>
157 355 <task id="LOCAL-00001" summary="添加库位、库位类型增删改查接口">
158 356 <created>1565226427512</created>
... ... @@ -210,21 +408,90 @@
210 408 <option name="LAST_COMMIT_MESSAGE" value="合并信义源码" />
211 409 </component>
212 410 <component name="WindowStateProjectService">
213   - <state x="550" y="111" key="CommitChangelistDialog2" timestamp="1578572128713">
  411 + <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1581988248941">
214 412 <screen x="0" y="0" width="1920" height="1040" />
215 413 </state>
  414 + <state x="414" y="175" key="#com.intellij.execution.impl.EditConfigurationsDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581988248941" />
  415 + <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog" timestamp="1581987412294">
  416 + <screen x="0" y="0" width="1920" height="1040" />
  417 + </state>
  418 + <state x="690" y="266" key="#com.intellij.refactoring.safeDelete.UnsafeUsagesDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581987412294" />
  419 + <state x="550" y="111" key="CommitChangelistDialog2" timestamp="1581991431575">
  420 + <screen x="0" y="0" width="1920" height="1040" />
  421 + </state>
  422 + <state x="550" y="111" key="CommitChangelistDialog2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991431575" />
216 423 <state x="550" y="111" key="CommitChangelistDialog2/0.0.1920.1040@0.0.1920.1040" timestamp="1578572128713" />
217 424 <state x="184" y="92" key="DiffContextDialog" timestamp="1578572140549">
218 425 <screen x="0" y="0" width="1920" height="1040" />
219 426 </state>
220 427 <state x="184" y="92" key="DiffContextDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1578572140549" />
  428 + <state width="1877" height="232" key="GridCell.Tab.0.bottom" timestamp="1581991356919">
  429 + <screen x="0" y="0" width="1920" height="1040" />
  430 + </state>
  431 + <state width="1877" height="232" key="GridCell.Tab.0.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" />
  432 + <state width="1877" height="232" key="GridCell.Tab.0.center" timestamp="1581991356919">
  433 + <screen x="0" y="0" width="1920" height="1040" />
  434 + </state>
  435 + <state width="1877" height="232" key="GridCell.Tab.0.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" />
  436 + <state width="1877" height="232" key="GridCell.Tab.0.left" timestamp="1581991356919">
  437 + <screen x="0" y="0" width="1920" height="1040" />
  438 + </state>
  439 + <state width="1877" height="232" key="GridCell.Tab.0.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" />
  440 + <state width="1877" height="232" key="GridCell.Tab.0.right" timestamp="1581991356919">
  441 + <screen x="0" y="0" width="1920" height="1040" />
  442 + </state>
  443 + <state width="1877" height="232" key="GridCell.Tab.0.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356919" />
  444 + <state width="1877" height="232" key="GridCell.Tab.1.bottom" timestamp="1581991356846">
  445 + <screen x="0" y="0" width="1920" height="1040" />
  446 + </state>
  447 + <state width="1877" height="232" key="GridCell.Tab.1.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
  448 + <state width="1877" height="232" key="GridCell.Tab.1.center" timestamp="1581991356846">
  449 + <screen x="0" y="0" width="1920" height="1040" />
  450 + </state>
  451 + <state width="1877" height="232" key="GridCell.Tab.1.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
  452 + <state width="1877" height="232" key="GridCell.Tab.1.left" timestamp="1581991356846">
  453 + <screen x="0" y="0" width="1920" height="1040" />
  454 + </state>
  455 + <state width="1877" height="232" key="GridCell.Tab.1.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
  456 + <state width="1877" height="232" key="GridCell.Tab.1.right" timestamp="1581991356846">
  457 + <screen x="0" y="0" width="1920" height="1040" />
  458 + </state>
  459 + <state width="1877" height="232" key="GridCell.Tab.1.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
  460 + <state width="1877" height="232" key="GridCell.Tab.2.bottom" timestamp="1581991356846">
  461 + <screen x="0" y="0" width="1920" height="1040" />
  462 + </state>
  463 + <state width="1877" height="232" key="GridCell.Tab.2.bottom/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
  464 + <state width="1877" height="232" key="GridCell.Tab.2.center" timestamp="1581991356846">
  465 + <screen x="0" y="0" width="1920" height="1040" />
  466 + </state>
  467 + <state width="1877" height="232" key="GridCell.Tab.2.center/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
  468 + <state width="1877" height="232" key="GridCell.Tab.2.left" timestamp="1581991356846">
  469 + <screen x="0" y="0" width="1920" height="1040" />
  470 + </state>
  471 + <state width="1877" height="232" key="GridCell.Tab.2.left/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
  472 + <state width="1877" height="232" key="GridCell.Tab.2.right" timestamp="1581991356846">
  473 + <screen x="0" y="0" width="1920" height="1040" />
  474 + </state>
  475 + <state width="1877" height="232" key="GridCell.Tab.2.right/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581991356846" />
221 476 <state x="552" y="253" key="Vcs.Push.Dialog.v2" timestamp="1578572617942">
222 477 <screen x="0" y="0" width="1920" height="1040" />
223 478 </state>
224 479 <state x="552" y="253" key="Vcs.Push.Dialog.v2/0.0.1920.1040@0.0.1920.1040" timestamp="1578572617942" />
  480 + <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1581986457286">
  481 + <screen x="0" y="0" width="1920" height="1040" />
  482 + </state>
  483 + <state x="742" y="437" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581986457286" />
  484 + <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog" timestamp="1581987510895">
  485 + <screen x="0" y="0" width="1920" height="1040" />
  486 + </state>
  487 + <state x="709" y="231" key="git4idea.branch.GitSmartOperationDialog/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581987510895" />
225 488 <state x="647" y="310" key="git4idea.merge.GitPullDialog" timestamp="1578572305258">
226 489 <screen x="0" y="0" width="1920" height="1040" />
227 490 </state>
228 491 <state x="647" y="310" key="git4idea.merge.GitPullDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1578572305258" />
  492 + <state x="623" y="225" width="672" height="678" key="search.everywhere.popup" timestamp="1581987109995">
  493 + <screen x="0" y="0" width="1920" height="1040" />
  494 + </state>
  495 + <state x="623" y="225" width="672" height="678" key="search.everywhere.popup/-1920.0.1920.1040/0.0.1920.1040@0.0.1920.1040" timestamp="1581987109995" />
229 496 </component>
230 497 </project>
231 498 \ No newline at end of file
... ...
src/main/java/com/huaheng/HuaHengApplication.java
  View file @8cf81d8
1 1 package com.huaheng;
2 2  
3   -import com.github.abel533.echarts.code.X;
4   -import com.huaheng.api.xinyi.constant.XinYiConstant;
5 3 import org.mybatis.spring.annotation.MapperScan;
6 4 import org.springframework.boot.SpringApplication;
7 5 import org.springframework.boot.autoconfigure.SpringBootApplication;
... ...
src/main/java/com/huaheng/common/utils/http/HttpUtils.java
  View file @8cf81d8
1 1 package com.huaheng.common.utils.http;
2 2  
3   -import java.io.*;
4   -import java.net.*;
5   -import java.security.cert.X509Certificate;
6   -import java.util.List;
7   -import java.util.Map;
8   -import javax.net.ssl.HostnameVerifier;
9   -import javax.net.ssl.HttpsURLConnection;
10   -import javax.net.ssl.SSLContext;
11   -import javax.net.ssl.SSLSession;
12   -import javax.net.ssl.TrustManager;
13   -import javax.net.ssl.X509TrustManager;
14   -
15   -
16   -import com.alibaba.fastjson.JSONObject;
17   -import com.huaheng.api.xinyi.domian.TokenEntity;
18   -import com.huaheng.common.utils.StringUtils;
19 3 import org.apache.http.HttpResponse;
20 4 import org.apache.http.HttpStatus;
21 5 import org.apache.http.client.methods.HttpPost;
... ... @@ -25,6 +9,11 @@ import org.apache.http.impl.client.HttpClients;
25 9 import org.slf4j.Logger;
26 10 import org.slf4j.LoggerFactory;
27 11  
  12 +import javax.net.ssl.*;
  13 +import java.io.*;
  14 +import java.net.*;
  15 +import java.security.cert.X509Certificate;
  16 +
28 17  
29 18 /**
30 19 * 通用http发送方法
... ... @@ -43,132 +32,6 @@ public class HttpUtils
43 32 * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
44 33 * @return 所代表远程资源的响应结果
45 34 */
46   - public static String sendGet(String url, TokenEntity tokenEntity, String param)
47   - {
48   - StringBuilder result = new StringBuilder();
49   - BufferedReader in = null;
50   - try
51   - {
52   - String urlNameString = url + "?" + param;
53   - if (StringUtils.isEmpty(param)){
54   - urlNameString = url;
55   - }
56   - log.info("sendGet - {}", urlNameString);
57   - URL realUrl = new URL(urlNameString);
58   - URLConnection connection = realUrl.openConnection();
59   - connection.setRequestProperty("accept", "*/*");
60   - connection.setRequestProperty("connection", "Keep-Alive");
61   - connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
62   - connection.setRequestProperty("Authorization", tokenEntity.getToken_type()+" "+tokenEntity.getAccess_token());
63   - connection.connect();
64   - if (((HttpURLConnection)connection).getResponseCode() >= 390) {
65   - in = new BufferedReader(new InputStreamReader(((HttpURLConnection) connection).getErrorStream()));
66   - } else {
67   - in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
68   - }
69   -// System.out.println(connection.getInputStream());
70   - String line;
71   - while ((line = in.readLine()) != null)
72   - {
73   - result.append(line);
74   - }
75   - log.info("recv - {}", result);
76   - }
77   - catch (ConnectException e)
78   - {
79   - log.error("调用HttpUtils.sendGet ConnectException, url=" + url + ",param=" + param, e.getMessage());
80   - }
81   - catch (SocketTimeoutException e)
82   - {
83   - log.error("调用HttpUtils.sendGet SocketTimeoutException, url=" + url + ",param=" + param, e.getMessage());
84   - }
85   - catch (IOException e)
86   - {
87   - log.error("调用HttpUtils.sendGet IOException, url=" + url + ",param=" + param, e.getMessage());
88   - }
89   - catch (Exception e)
90   - {
91   - log.error("调用HttpsUtil.sendGet Exception, url=" + url + ",param=" + param, e.getMessage());
92   - }
93   - finally
94   - {
95   - try
96   - {
97   - if (in != null)
98   - {
99   - in.close();
100   - }
101   - }
102   - catch (Exception ex)
103   - {
104   - log.error("调用in.close Exception, url=" + url + ",param=" + param, ex.getMessage());
105   - }
106   - }
107   - return result.toString();
108   - }
109   -
110   - /**
111   - * 向指定URL发送GET方法的请求
112   - * @param url 发送请求的URL
113   - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
114   - * @return URL 所代表远程资源的响应结果
115   - */
116   - public static String sendGetTest(String url, TokenEntity tokenEntity, String param) {
117   - String result = "";
118   - BufferedReader in = null;
119   - try {
120   - String urlNameString;
121   - if (StringUtils.isEmpty(param)) {
122   - urlNameString = url;
123   - } else {
124   - urlNameString = url + "/" + param;
125   - }
126   - URL realUrl = new URL(urlNameString);
127   - // 打开和URL之间的连接
128   - URLConnection connection = realUrl.openConnection();
129   - // 设置通用的请求属性
130   - connection.setRequestProperty("accept", "*/*");
131   - connection.setRequestProperty("connection", "Keep-Alive");
132   - connection.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
133   - connection.setRequestProperty("Authorization", tokenEntity.getToken_type()+" "+tokenEntity.getAccess_token());
134   - // 建立实际的连接
135   - connection.connect();
136   - // 获取所有响应头字段
137   - Map<String, List<String>> map = connection.getHeaderFields();
138   - // 遍历所有的响应头字段
139   - for (String key : map.keySet()) {
140   - System.out.println(key + "--->" + map.get(key));
141   - }
142   - // 定义 BufferedReader输入流来读取URL的响应
143   - in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
144   - String line;
145   - while ((line = in.readLine()) != null) {
146   - result += line;
147   - }
148   - } catch (Exception e) {
149   - System.out.println("发送GET请求出现异常！" + e);
150   - e.printStackTrace();
151   - }
152   - // 使用finally块来关闭输入流
153   - finally {
154   - try {
155   - if (in != null) {
156   - in.close();
157   - }
158   - } catch (Exception e2) {
159   - e2.printStackTrace();
160   - }
161   - }
162   - return result;
163   - }
164   -
165   - /**
166   - * 向指定 URL 发送GET方法的请求
167   - *
168   - * @param url 发送请求的 URL
169   - * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
170   - * @return 所代表远程资源的响应结果
171   - */
172 35 public static String sendGet(String url, String param)
173 36 {
174 37 StringBuilder result = new StringBuilder();
... ... @@ -252,7 +115,12 @@ public class HttpUtils
252 115 out = new PrintWriter(conn.getOutputStream());
253 116 out.print(param);
254 117 out.flush();
255   - in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
  118 + if (((HttpURLConnection)conn).getResponseCode() >= 390) {
  119 + in = new BufferedReader(new InputStreamReader(((HttpURLConnection) conn).getErrorStream()));
  120 + } else {
  121 + in = new BufferedReader(new InputStreamReader(conn.getInputStream()));
  122 + }
  123 +// in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "utf-8"));
256 124 String line;
257 125 while ((line = in.readLine()) != null)
258 126 {
... ... @@ -400,7 +268,7 @@ public class HttpUtils
400 268 * @param url
401 269 * @return
402 270 */
403   - public static String sendJsonPost(String json, String url){
  271 + public static String sendJsonPostToken(String json, String url){
404 272 String result = "";
405 273 HttpPost post = new HttpPost(url);
406 274 try{
... ...
src/main/java/com/huaheng/mobile/general/CompanyInfo.java
  View file @8cf81d8
... ... @@ -9,10 +9,12 @@ public class CompanyInfo {
9 9  
10 10 private int companyId;
11 11 private String companyCode;
  12 + private String companyName;
12 13  
13   - public CompanyInfo(int companyId, String companyCode) {
  14 + public CompanyInfo(int companyId, String companyCode, String companyName) {
14 15 this.companyId = companyId;
15 16 this.companyCode = companyCode;
  17 + this.companyName = companyName;
16 18 }
17 19  
18 20 public int getCompanyId() {
... ... @@ -31,11 +33,20 @@ public class CompanyInfo {
31 33 this.companyCode = companyCode;
32 34 }
33 35  
  36 + public String getCompanyName() {
  37 + return companyName;
  38 + }
  39 +
  40 + public void setCompanyName(String companyName) {
  41 + this.companyName = companyName;
  42 + }
  43 +
34 44 @Override
35 45 public String toString() {
36 46 return "CompanyInfo{" +
37 47 "companyId=" + companyId +
38 48 ", companyCode='" + companyCode + '\'' +
  49 + ", companyName='" + companyName + '\'' +
39 50 '}';
40 51 }
41 52 }
... ...
src/main/java/com/huaheng/mobile/general/MobileUserController.java
  View file @8cf81d8
... ... @@ -78,9 +78,6 @@ public class MobileUserController extends BaseController {
78 78 @PostMapping("/getModules")
79 79 @ApiOperation("获取当前用户模块列表")
80 80 public AjaxResult getModules(@RequestBody @ApiParam(value="WarehouseId和warehouseCode的Map集合") Map<String, String> param) {
81   - if (param.get("warehouseId") == null) {
82   - throw new JSONException("warehouseId(仓库id)不能为空");
83   - }
84 81 if (param.get("warehouseCode") == null) {
85 82 throw new JSONException("warehouseCode(仓库编码)不能为空");
86 83 }
... ... @@ -111,7 +108,7 @@ public class MobileUserController extends BaseController {
111 108 List<Company> companies = companyService.list(queryWrapper);
112 109 List<CompanyInfo> companyInfos = new ArrayList<>();
113 110 for(Company company : companies) {
114   - companyInfos.add(new CompanyInfo(company.getId(), company.getCode()));
  111 + companyInfos.add(new CompanyInfo(company.getId(), company.getCode(), company.getName()));
115 112 }
116 113 return AjaxResult.success(companyInfos);
117 114 }
... ...
src/main/java/com/huaheng/mobile/invenory/MobileInventory.java
  View file @8cf81d8
... ... @@ -12,36 +12,22 @@ import java.math.BigDecimal;
12 12 @Data
13 13 public class MobileInventory {
14 14  
15   - /**
16   - * 库位id
17   - */
  15 + /** 库位id */
18 16 private int id;
19   - /**
20   - * 库位编号
21   - */
  17 + /** 库位编号 */
22 18 private String locationCode;
23   - /**
24   - * 物料编码
25   - */
  19 + /** 容器编号 */
  20 + private String containerCode;
  21 + /** 物料编码 */
26 22 private String materialCode;
27   - /**
28   - * 物料名称
29   - */
  23 + /**物料名称 */
30 24 private String materialName;
31   - /**
32   - * 物料规格
33   - */
  25 + /**物料规格 */
34 26 private String specification;
35   - /**
36   - * 数量
37   - */
  27 + /** 数量 */
38 28 private BigDecimal qty;
39   - /**
40   - * 任务数量
41   - */
  29 + /** 任务数量 */
42 30 private BigDecimal taskQty = new BigDecimal(0);
43   - /**
44   - * 结果类型
45   - */
  31 + /** 结果类型 */
46 32 private int resultType;
47 33 }
... ...
src/main/java/com/huaheng/mobile/invenory/MobileInventoryController.java
  View file @8cf81d8
... ... @@ -11,6 +11,8 @@ import com.huaheng.common.utils.security.ShiroUtils;
11 11 import com.huaheng.framework.aspectj.lang.annotation.Log;
12 12 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
13 13 import com.huaheng.framework.web.domain.AjaxResult;
  14 +import com.huaheng.pc.config.container.domain.Container;
  15 +import com.huaheng.pc.config.container.service.ContainerService;
14 16 import com.huaheng.pc.config.location.domain.Location;
15 17 import com.huaheng.pc.config.location.service.LocationService;
16 18 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
... ... @@ -48,6 +50,8 @@ public class MobileInventoryController {
48 50 ExcelReportMapper mapper;
49 51 @Resource
50 52 private CycleCountDetailService cycleCountDetailService;
  53 + @Resource
  54 + private ContainerService containerService;
51 55  
52 56 @PostMapping("/getInventoryInfo")
53 57 @ApiOperation("移动端获得库存详情")
... ... @@ -94,7 +98,10 @@ public class MobileInventoryController {
94 98 }
95 99  
96 100 AjaxResult ajaxResult = taskService.sendTaskToWcs(Convert.toIntArray(taskId));
97   - return ajaxResult;
  101 + if(ajaxResult.hasErr()) {
  102 + AjaxResult.success("执行失败");
  103 + }
  104 + return AjaxResult.success("下发执行成功");
98 105 }
99 106  
100 107 @PostMapping( "/executeList")
... ... @@ -174,9 +181,9 @@ public class MobileInventoryController {
174 181 if (param.get("containerCode") == null || param.get("containerCode").trim().length() < 1) {
175 182 throw new JSONException("容器号不能为空");
176 183 }
177   - if (param.get("destinationLocation") == null || param.get("destinationLocation").trim().length() < 1) {
178   - throw new JSONException("目的库位不能为空");
179   - }
  184 +// if (param.get("destinationLocation") == null || param.get("destinationLocation").trim().length() < 1) {
  185 +// throw new JSONException("目的库位不能为空");
  186 +// }
180 187 String containerCode = param.get("containerCode");
181 188 String destinationLocation = param.get("destinationLocation");
182 189 String companyCode = param.get("companyCode");
... ... @@ -354,4 +361,34 @@ public class MobileInventoryController {
354 361 BigDecimal qty = new BigDecimal(param.get("qty"));
355 362 return cycleCountDetailService.confirmGapQty(detailId, qty);
356 363 }
  364 +
  365 + @PostMapping("/getEmptyContainerInLocation")
  366 + @ApiOperation("选取空托出库的库位")
  367 + @Log(title = "选取空托出库的库位", action = BusinessType.OTHER)
  368 + public AjaxResult getEmptyContainerInLocation(@RequestBody Map<String, String> param) {
  369 + String warehouCOde = ShiroUtils.getWarehouseCode();
  370 + List<Location> list = containerService.getEmptyContainerInLocation(null,null,ShiroUtils.getWarehouseCode());
  371 + return AjaxResult.success(list);
  372 + }
  373 +
  374 + @PostMapping("/pickLocation")
  375 + @ApiOperation("选取补充入库的库位")
  376 + @Log(title = "选取补充入库的库位", action = BusinessType.OTHER)
  377 + public AjaxResult pickLocation(@RequestBody Map<String, String> param) {
  378 + List<Location> locations = locationService.pickLocation();
  379 + Container condition = new Container();
  380 + condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
  381 + LambdaQueryWrapper lambda3 = Wrappers.lambdaQuery(condition);
  382 + List<Container> containers = containerService.list(lambda3);
  383 + for(Location location : locations) {
  384 + for(Container container : containers) {
  385 + if(container.getCode().equals(location.getContainerCode())) {
  386 + if(container.getStatus().equals("some")) {
  387 + location.setStatus("some");
  388 + }
  389 + }
  390 + }
  391 + }
  392 + return AjaxResult.success(locations);
  393 + }
357 394 }
... ...
src/main/java/com/huaheng/mobile/receipt/MobileBatchReceiptController.java
  View file @8cf81d8
... ... @@ -3,17 +3,19 @@ package com.huaheng.mobile.receipt;
3 3 import com.alibaba.fastjson.JSONException;
4 4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6   -import com.huaheng.api.wcs.domain.WcsTask;
  6 +import com.huaheng.api.general.domain.Receipt;
7 7 import com.huaheng.common.constant.QuantityConstant;
  8 +import com.huaheng.common.exception.service.ServiceException;
  9 +import com.huaheng.common.utils.StringUtils;
8 10 import com.huaheng.common.utils.security.ShiroUtils;
9 11 import com.huaheng.framework.aspectj.lang.annotation.Log;
10 12 import com.huaheng.framework.aspectj.lang.constant.BusinessType;
11 13 import com.huaheng.framework.web.domain.AjaxResult;
  14 +import com.huaheng.pc.config.company.domain.Company;
  15 +import com.huaheng.pc.config.company.service.CompanyService;
12 16 import com.huaheng.pc.config.container.domain.Container;
13   -import com.huaheng.pc.config.container.domain.ContainerStatus;
14 17 import com.huaheng.pc.config.container.service.ContainerService;
15 18 import com.huaheng.pc.config.location.domain.Location;
16   -import com.huaheng.pc.config.location.domain.LocationStatus;
17 19 import com.huaheng.pc.config.location.service.LocationService;
18 20 import com.huaheng.pc.config.material.domain.Material;
19 21 import com.huaheng.pc.config.material.service.MaterialService;
... ... @@ -24,16 +26,20 @@ import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
24 26 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
25 27 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
26 28 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
  29 +import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
  30 +import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
27 31 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
28 32 import com.huaheng.pc.task.taskHeader.service.TaskHeaderService;
  33 +import groovy.json.JsonException;
29 34 import io.swagger.annotations.Api;
30 35 import io.swagger.annotations.ApiOperation;
31 36 import io.swagger.annotations.ApiParam;
32   -import javafx.concurrent.Task;
33 37 import org.springframework.transaction.annotation.Transactional;
34 38 import org.springframework.web.bind.annotation.*;
35 39  
36 40 import javax.annotation.Resource;
  41 +import java.math.BigDecimal;
  42 +import java.util.Date;
37 43 import java.util.List;
38 44 import java.util.Map;
39 45  
... ... @@ -64,43 +70,43 @@ public class MobileBatchReceiptController {
64 70 private LocationService locationService;
65 71 @Resource
66 72 private TaskHeaderService taskHeaderService;
  73 + @Resource
  74 + private TaskDetailService taskDetailService;
  75 + @Resource
  76 + private CompanyService companyService;
67 77  
68   - @PostMapping("/scanBill")
69   - @ApiOperation("移动端扫描入库单")
70   - @Log(title = "移动端扫描入库单", action = BusinessType.OTHER)
71   - public AjaxResult scanBill(@RequestBody @ApiParam(value="收货单号") Map<String, String> param) throws Exception {
72   - if (param.get("code") == null || param.get("code").trim().length() < 1) {
73   - throw new JSONException("收货单号(code)不能为空");
74   - }
75   - return receiptContainerDetailService.scanReceiptCode(param.get("code"));
76   - }
77 78  
78 79 @PostMapping("/scanContainer")
79 80 @ApiOperation("移动端入库扫描容器")
80 81 @Log(title = "移动端入库扫描容器", action = BusinessType.OTHER)
81   - public AjaxResult scanContainer(@RequestBody @ApiParam(value="容器号") Map<String, String> param) throws Exception {
82   - if (param.get("code") == null || param.get("code").trim().length() < 1) {
  82 + public AjaxResult scanContainer(@RequestBody @ApiParam(value = "容器号") Map<String, String> param) throws Exception {
  83 + if (param.get("code") == null || param.get("code").trim().length() < 1) {
83 84 throw new JSONException("容器号(code)不能为空");
84 85 }
85 86  
86 87 ReceiptContainerView receiptContainerView = new ReceiptContainerView();
87 88 receiptContainerView.setReceiptContainerCode(param.get("code"));
88   - receiptContainerView.setTaskType((short)100);
  89 + receiptContainerView.setTaskType((short) 100);
89 90 AjaxResult result = receiptContainerHeaderService.checkContainer(receiptContainerView);
90 91 LambdaQueryWrapper<Container> containerLambdaQueryWrapper = Wrappers.lambdaQuery();
91   - containerLambdaQueryWrapper.eq(Container::getCode, param.get("code"))
92   - .eq(Container::getWarehouseCode, ShiroUtils.getWarehouseCode());
  92 + containerLambdaQueryWrapper.eq(Container::getCode, param.get("code"));
93 93 Container container = containerService.getOne(containerLambdaQueryWrapper);
94   - if(!container.getStatus().equals("empty")) {
  94 + if (container == null) {
  95 + return AjaxResult.error("托盘编码错误");
  96 + }
  97 + if (!container.getStatus().equals("empty")) {
95 98 return AjaxResult.error("托盘状态不为空");
96 99 }
  100 + if (!container.getLocationCode().equals("")) {
  101 + return AjaxResult.error("");
  102 + }
97 103 return result;
98 104 }
99 105  
100 106 @PostMapping("/save")
101 107 @ApiOperation("移动端收货保存")
102 108 @Log(title = "移动端收货保存", action = BusinessType.OTHER)
103   - public AjaxResult save(@RequestBody @ApiParam(value="收货单") List<ReceiptContainerView> record) throws Exception {
  109 + public AjaxResult save(@RequestBody @ApiParam(value = "收货单") List<ReceiptContainerView> record) throws Exception {
104 110 AjaxResult result = receiptContainerHeaderService.batchSave(record);
105 111 return result;
106 112 }
... ... @@ -108,18 +114,12 @@ public class MobileBatchReceiptController {
108 114 @PostMapping("/getMaterial")
109 115 @ApiOperation("移动端获取物料信息")
110 116 @Log(title = "移动端获取物料信息", action = BusinessType.OTHER)
111   - public AjaxResult getMaterial(@RequestBody @ApiParam(value="物料号") Map<String, String> param) throws Exception {
112   - if (param.get("code") == null || param.get("code").trim().length() < 1) {
  117 + public AjaxResult getMaterial(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
  118 + if (param.get("code") == null || param.get("code").trim().length() < 1) {
113 119 throw new JSONException("容器号(code)不能为空");
114 120 }
115   - if (param.get("companyCode") == null || param.get("companyCode").trim().length() < 1) {
116   - throw new JSONException("(companyCode)不能为空");
117   - }
118   - if (param.get("companyId") == null || param.get("companyId").trim().length() < 1) {
119   - throw new JSONException("(companyId)不能为空");
120   - }
121 121 Material material = materialService.findAllByCode(param.get("code"));
122   - if(material == null) {
  122 + if (material == null) {
123 123 return AjaxResult.error("没有该物料");
124 124 }
125 125 MaterialInfo materialInfo = new MaterialInfo();
... ... @@ -130,16 +130,41 @@ public class MobileBatchReceiptController {
130 130 return AjaxResult.success(materialInfo);
131 131 }
132 132  
  133 + @PostMapping("/getLatestMaterial")
  134 + @ApiOperation("移动端获取物料信息")
  135 + @Log(title = "移动端获取物料信息", action = BusinessType.OTHER)
  136 + public AjaxResult getLatestMaterial(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
  137 + List<Material> materials = materialService.findLatest();
  138 + if (materials == null) {
  139 + return AjaxResult.error("没有找到物料");
  140 + }
  141 +
  142 + return AjaxResult.success(materials);
  143 + }
  144 +
  145 + @PostMapping("/getLatestReceipt")
  146 + @ApiOperation("移动端获取入库单")
  147 + @Log(title = "移动端获取入库单", action = BusinessType.OTHER)
  148 + public AjaxResult getLatestReceipt(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
  149 + List<ReceiptHeader> receiptHeaders = receiptHeaderService.getLatestReceipt();
  150 + if (receiptHeaders == null) {
  151 + return AjaxResult.error("没有找到入库单");
  152 + }
  153 + return AjaxResult.success(receiptHeaders);
  154 + }
  155 +
  156 +
  157 +
133 158 @PostMapping("/checkLocation")
134 159 @ApiOperation("移动端验证库位")
135 160 @Log(title = "移动端验证库位", action = BusinessType.OTHER)
136   - public AjaxResult checkLocation(@RequestBody @ApiParam(value="物料号") Map<String, String> param) throws Exception {
137   - if (param.get("code") == null || param.get("code").trim().length() < 1) {
  161 + public AjaxResult checkLocation(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
  162 + if (param.get("code") == null || param.get("code").trim().length() < 1) {
138 163 throw new JSONException("容器号(code)不能为空");
139 164 }
140 165  
141 166 boolean result = locationService.checkLocation(param.get("code"));
142   - if(!result) {
  167 + if (!result) {
143 168 return AjaxResult.error("没有该库位");
144 169 }
145 170 return AjaxResult.success(result);
... ... @@ -148,18 +173,18 @@ public class MobileBatchReceiptController {
148 173 @PostMapping("/getFreeLocation")
149 174 @ApiOperation("移动端获得空闲库位")
150 175 @Log(title = "移动端获得空闲库位", action = BusinessType.OTHER)
151   - public AjaxResult getFreeLocation(@RequestBody @ApiParam(value="物料号") Map<String, String> param) throws Exception {
152   - if (param.get("materialCode") == null || param.get("materialCode").trim().length() < 1) {
  176 + public AjaxResult getFreeLocation(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
  177 + if (param.get("materialCode") == null || param.get("materialCode").trim().length() < 1) {
153 178 throw new JSONException("materialCode不能为空");
154 179 }
155 180  
156   - if (param.get("batch") == null || param.get("batch").trim().length() < 1) {
  181 + if (param.get("batch") == null || param.get("batch").trim().length() < 1) {
157 182 throw new JSONException("batch不能为空");
158 183 }
159 184 String materialCode = param.get("materialCode");
160 185 String batch = param.get("batch");
161 186 boolean result = locationService.getFreeLocation(materialCode, batch);
162   - if(!result) {
  187 + if (!result) {
163 188 return AjaxResult.error("没有空闲的分区库位");
164 189 }
165 190 return AjaxResult.success(result);
... ... @@ -168,8 +193,8 @@ public class MobileBatchReceiptController {
168 193 @PostMapping("/getContainerCode")
169 194 @ApiOperation("移动端验证库位")
170 195 @Log(title = "移动端验证库位", action = BusinessType.OTHER)
171   - public AjaxResult getContainerCode(@RequestBody @ApiParam(value="物料号") Map<String, String> param) throws Exception {
172   - if (param.get("code") == null || param.get("code").trim().length() < 1) {
  196 + public AjaxResult getContainerCode(@RequestBody @ApiParam(value = "物料号") Map<String, String> param) throws Exception {
  197 + if (param.get("code") == null || param.get("code").trim().length() < 1) {
173 198 throw new JSONException("容器号(code)不能为空");
174 199 }
175 200 LambdaQueryWrapper<Location> queryWrapper = Wrappers.lambdaQuery();
... ... @@ -177,53 +202,125 @@ public class MobileBatchReceiptController {
177 202 .eq(Location::getWarehouseCode, ShiroUtils.getWarehouseCode())
178 203 .eq(Location::getDeleted, false);
179 204 Location location = locationService.getOne(queryWrapper);
180   - if(location == null) {
  205 + if (location == null) {
181 206 return AjaxResult.error("没有该库位");
182 207 }
183 208 return AjaxResult.success("成功", location.getContainerCode());
184 209 }
185 210  
186   -// @PostMapping("/quickSaveGoods")
187   -// @ApiOperation("移动端收货保存")
188   -// @Log(title = "移动端收货保存", action = BusinessType.OTHER)
189   -// @Transactional(rollbackFor = Exception.class)
190   -// public AjaxResult quickSaveGoods(@RequestBody @ApiParam(value="收货单") List<ReceiptBill> receiptBills) throws Exception {
191   -// if (receiptBills == null || receiptBills.size() <=0) {
192   -// throw new JSONException("没有收货信息");
193   -// }
194   -//
195   -// /* 查询未完成的入库任务*/
196   -// LambdaQueryWrapper<TaskHeader> taskQueryWrapper = Wrappers.lambdaQuery();
197   -// taskQueryWrapper.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
198   -// .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLERECEIPT,
199   -// QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)
200   -// .lt(TaskHeader::getStatus, QuantityConstant.TASK_STATUS_COMPLETED);
201   -//
202   -// List<TaskHeader> taskHeaderList = taskHeaderService.list(taskQueryWrapper);
203   -// if(!taskHeaderList.isEmpty()) {
204   -// throw new JSONException("入库任务没有完成");
205   -// }
206   -//
207   -// ReceiptContainerView record = new ReceiptContainerView();
208   -// record.setReceiptContainerCode(receiptBills.get(0).getReceiptContainerCode());
209   -// record.setLocationCode(receiptBills.get(0).getLocationCode());
210   -// record.setTaskType((short)100);
211   -// record.setCompanyCode(receiptBills.get(0).getCompanyCode());
212   -//
213   -// /* 验证容器*/
214   -// LambdaQueryWrapper<Container> containerQueryWrapper = Wrappers.lambdaQuery();
215   -// containerQueryWrapper.eq(Container::getCode, receiptBills.get(0).getReceiptContainerCode())
216   -// .eq(Container::getWarehouseCode, ShiroUtils.getWarehouseCode());
217   -//
218   -// Container container = containerService.getOne(containerQueryWrapper);
219   -// if(container == null) {
220   -// throw new SecurityException("容器编码不存在");
221   -// }
222   -// if(!container.getStatus().equals("empty")) {
223   -// return AjaxResult.error("托盘状态不为空");
224   -// }
225   -//
226   -// receiptContainerHeaderService.mobileCheckLocationCode(record);
227   -// return AjaxResult.success("收货成功");
228   -// }
  211 + @PostMapping("/quickReceipt")
  212 + @ApiOperation("移动端收货保存")
  213 + @Log(title = "移动端收货保存", action = BusinessType.OTHER)
  214 + @Transactional(rollbackFor = Exception.class)
  215 + public AjaxResult quickReceipt(@RequestBody @ApiParam(value="收货单") List<ReceiptBill> receiptBills) throws Exception {
  216 + if (receiptBills == null || receiptBills.size() <=0) {
  217 + throw new JSONException("没有收货信息");
  218 + }
  219 + String containerCode = receiptBills.get(0).receiptContainerCode;
  220 + String locationCode = receiptBills.get(0).locationCode;
  221 + String companyCode = receiptBills.get(0).getCompanyCode();
  222 + String receiptDetailId = receiptBills.get(0).getReceiptDetailId();
  223 +
  224 + LambdaQueryWrapper<Container> containerQueryWrapper = Wrappers.lambdaQuery();
  225 + containerQueryWrapper.eq(Container::getCode, containerCode);
  226 + Container container = containerService.getOne(containerQueryWrapper);
  227 + if(container == null) {
  228 + throw new JSONException("不存在这个托盘");
  229 + }
  230 + if(locationCode.equals(container.getLocationCode())) {
  231 + /* 查询未完成的入库任务*/
  232 + LambdaQueryWrapper<TaskHeader> taskQueryWrapper = Wrappers.lambdaQuery();
  233 + taskQueryWrapper.eq(TaskHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
  234 + .in(TaskHeader::getTaskType, QuantityConstant.TASK_TYPE_WHOLERECEIPT,
  235 + QuantityConstant.TASK_TYPE_SUPPLEMENTRECEIPT)
  236 + .lt(TaskHeader::getStatus, 100)
  237 + .eq(TaskHeader::getContainerCode, containerCode);
  238 + TaskHeader taskHeader = taskHeaderService.getOne(taskQueryWrapper);
  239 + if(taskHeader == null) {
  240 + throw new JSONException("没有找到托盘对应的任务");
  241 + }
  242 +
  243 + LambdaQueryWrapper<ReceiptDetail> receiptDetailQueryWrapper = Wrappers.lambdaQuery();
  244 + receiptDetailQueryWrapper.eq(ReceiptDetail::getId, receiptDetailId);
  245 + ReceiptDetail receiptDetail = receiptDetailService.getOne(receiptDetailQueryWrapper);
  246 + if(receiptDetail == null) {
  247 + throw new JSONException("没有找到入库单详情");
  248 + }
  249 +
  250 + LambdaQueryWrapper<ReceiptHeader> receiptHeaderQueryWrapper = Wrappers.lambdaQuery();
  251 + receiptHeaderQueryWrapper.eq(ReceiptHeader::getId, receiptDetail.getReceiptId());
  252 + ReceiptHeader receiptHeader = receiptHeaderService.getOne(receiptHeaderQueryWrapper);
  253 + if(receiptHeader == null) {
  254 + throw new JSONException("没有找到入库单");
  255 + }
  256 +
  257 + for(ReceiptBill receiptBill : receiptBills) {
  258 +
  259 + TaskDetail taskDetail = new TaskDetail();
  260 + taskDetail.setTaskId(taskHeader.getId());
  261 + taskDetail.setContainerCode(containerCode);
  262 + taskDetail.setTaskType(taskHeader.getTaskType());
  263 + taskDetail.setInternalTaskType(taskHeader.getInternalTaskType());
  264 + taskDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
  265 + taskDetail.setCompanyCode(companyCode);
  266 + taskDetail.setBillCode(receiptHeader.getCode());
  267 + taskDetail.setBillDetailId(Integer.parseInt(receiptBill.getReceiptDetailId()));
  268 + taskDetail.setMaterialCode(receiptBill.getMaterialCode());
  269 + taskDetail.setMaterialName(receiptBill.getMaterialName());
  270 + taskDetail.setQty(receiptBill.getQty());
  271 + taskDetail.setFromLocation(taskHeader.getFromLocation());
  272 + taskDetail.setToLocation(taskHeader.getToLocation());
  273 + taskDetail.setStatus(taskHeader.getStatus());
  274 + taskDetail.setBatch(receiptBill.getBatch());
  275 + taskDetail.setCompanyCode(taskHeader.getCompanyCode());
  276 + taskDetailService.save(taskDetail);
  277 +
  278 +
  279 + LambdaQueryWrapper<ReceiptDetail> receiptDetail2QueryWrapper = Wrappers.lambdaQuery();
  280 + receiptDetail2QueryWrapper.eq(ReceiptDetail::getId, receiptBill.getReceiptDetailId());
  281 + ReceiptDetail receiptDetail2 = receiptDetailService.getOne(receiptDetail2QueryWrapper);
  282 + if(receiptDetail2 == null) {
  283 + throw new JSONException("没有找到入库单详情");
  284 + }
  285 +
  286 + BigDecimal openQty = receiptDetail2.getOpenQty();
  287 + BigDecimal totalQty = receiptDetail2.getTotalQty();
  288 + BigDecimal qty = openQty.add(receiptBill.getQty());
  289 + if(totalQty.subtract(qty).compareTo(BigDecimal.ZERO) < 0) {
  290 + throw new Exception("配盘数量大于表单数量");
  291 + }
  292 +
  293 + receiptDetail2.setOpenQty(qty);
  294 + receiptDetailService.update(receiptDetail2, receiptDetail2QueryWrapper);
  295 + }
  296 +
  297 + } else {
  298 + ReceiptContainerView record = new ReceiptContainerView();
  299 + record.setReceiptContainerCode(receiptBills.get(0).getReceiptContainerCode());
  300 + record.setLocationCode(receiptBills.get(0).getLocationCode());
  301 + record.setTaskType((short)100);
  302 + record.setCompanyCode(receiptBills.get(0).getCompanyCode());
  303 + receiptContainerHeaderService.checkContainer(record);
  304 + receiptContainerHeaderService.mobileCheckLocationCode(record);
  305 + int receiptHeaderId = receiptHeaderService.createTodayHeader(companyCode);
  306 + ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptHeaderId);
  307 + List<Integer> receiptDetailIds = receiptDetailService.insertTodayReceiptDetail(receiptHeaderId, receiptBills, true, companyCode);
  308 + if(receiptDetailIds != null && receiptDetailIds.size() > 0) {
  309 + int containerHeaderId = receiptContainerHeaderService.insertTodayReceiptContainerHeader(receiptBills.get(0), receiptHeader.getCode());
  310 + if(containerHeaderId > 0) {
  311 + List<Integer> receiptContainerDetailIds = receiptContainerDetailService.insertTodayReceiptcContainerDetail(containerHeaderId, receiptHeaderId, receiptDetailIds, receiptBills);
  312 + if(receiptContainerDetailIds != null && receiptContainerDetailIds.size() > 0) {
  313 +
  314 + } else {
  315 + return AjaxResult.error("入库组盘失败");
  316 + }
  317 + } else {
  318 + return AjaxResult.error("插入入库容器表单头失败");
  319 + }
  320 + } else {
  321 + return AjaxResult.error("插入入库明细表单失败");
  322 + }
  323 + }
  324 + return AjaxResult.success("收货成功");
  325 + }
229 326 }
... ...
src/main/java/com/huaheng/mobile/receipt/ReceiptBill.java
  View file @8cf81d8
... ... @@ -23,8 +23,12 @@ public class ReceiptBill {
23 23 String batch;
24 24 /** 项目号 */
25 25 String project;
  26 +
  27 + String receiptDetailId;
  28 +
26 29 /** 货主Code */
27 30 String companyCode;
28 31 /** 重量 */
29 32 String weight;
  33 + String materialName;
30 34 }
... ...
src/main/java/com/huaheng/mobile/shipment/MobileShipmentController.java 0 → 100644
  View file @8cf81d8
  1 +package com.huaheng.mobile.shipment;
  2 +
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.huaheng.common.exception.BusinessException;
  6 +import com.huaheng.common.utils.StringUtils;
  7 +import com.huaheng.common.utils.security.ShiroUtils;
  8 +import com.huaheng.framework.aspectj.lang.annotation.Log;
  9 +import com.huaheng.framework.aspectj.lang.constant.BusinessType;
  10 +import com.huaheng.framework.web.controller.BaseController;
  11 +import com.huaheng.framework.web.domain.AjaxResult;
  12 +import com.huaheng.pc.config.company.domain.Company;
  13 +import com.huaheng.pc.config.company.service.CompanyService;
  14 +import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
  15 +import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
  16 +import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
  17 +import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
  18 +import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
  19 +import io.swagger.annotations.ApiParam;
  20 +import org.springframework.web.bind.annotation.*;
  21 +
  22 +import javax.annotation.Resource;
  23 +import java.util.List;
  24 +import java.util.Map;
  25 +
  26 +/**
  27 + * @author mahua
  28 + * @ClassName MobileShipmentController
  29 + * @projectName wms_xinyi
  30 + * @description: TODO
  31 + * @date 2020/2/1115:29
  32 + */
  33 +@RestController
  34 +@RequestMapping("/mobile/shipment")
  35 +public class MobileShipmentController extends BaseController {
  36 + @Resource
  37 + private ShipmentHeaderService shipmentHeaderService;
  38 + @Resource
  39 + private ShipmentDetailService shipmentDetailService;
  40 + @Resource
  41 + private ShipmentContainerHeaderService shipmentContainerHeaderService;
  42 + @Resource
  43 + private CompanyService companyService;
  44 +
  45 +
  46 + /**
  47 + * 自动组盘
  48 + * @param shipmentCode
  49 + * @return
  50 + */
  51 + @PostMapping("/autoCombination")
  52 + @ResponseBody
  53 + public AjaxResult autoCombination(String shipmentCode){
  54 + AjaxResult ajaxResult = shipmentContainerHeaderService.autoCombination(shipmentCode);
  55 + return ajaxResult;
  56 + }
  57 +}
... ...
src/main/java/com/huaheng/mobile/shipment/Shipment.java 0 → 100644
  View file @8cf81d8
  1 +package com.huaheng.mobile.shipment;
  2 +
  3 +import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
  4 +import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
  5 +import lombok.Data;
  6 +
  7 +import java.io.Serializable;
  8 +import java.util.List;
  9 +
  10 +/**
  11 + * @author mahua
  12 + * @ClassName Shipment
  13 + * @projectName wms_xinyi
  14 + * @description: TODO
  15 + * @date 2020/2/1115:46
  16 + */
  17 +@Data
  18 +public class Shipment implements Serializable {
  19 +
  20 + private ShipmentHeader shipmentHeader;
  21 +
  22 + private List<ShipmentDetail> shipmentDetailList;
  23 +
  24 +}
... ...
src/main/java/com/huaheng/pc/config/company/service/CompanyService.java
  View file @8cf81d8
... ... @@ -21,5 +21,4 @@ public interface CompanyService extends IService&lt;Company&gt;{
21 21  
22 22 List<Company> selectListEntityByEqual(Company condition);
23 23  
24   - AjaxResult erpAddCompany();
25 24 }
... ...
src/main/java/com/huaheng/pc/config/company/service/CompanyServiceImpl.java
  View file @8cf81d8
... ... @@ -3,10 +3,6 @@ package com.huaheng.pc.config.company.service;
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6   -import com.huaheng.api.xinyi.domian.Inventories;
7   -import com.huaheng.api.xinyi.domian.Organization;
8   -import com.huaheng.api.xinyi.service.BasisService;
9   -import com.huaheng.common.exception.BusinessException;
10 6 import com.huaheng.common.utils.security.ShiroUtils;
11 7 import com.huaheng.framework.web.domain.AjaxResult;
12 8 import com.huaheng.pc.config.company.domain.Company;
... ... @@ -30,8 +26,6 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
30 26 private UserCompanyMapper userCompanyMapper;
31 27 @Resource
32 28 private WarehouseCompanyService warehouseCompanyService;
33   - @Resource
34   - private BasisService basisService;
35 29 @Override
36 30 public List<Company> selectCompanyByCurrentUserId() {
37 31 return companyMapper.selectCompanyByUserId(ShiroUtils.getUserId(), ShiroUtils.getWarehouseCode());
... ... @@ -85,8 +79,9 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
85 79  
86 80 @Override
87 81 public AjaxResult updateCompany(Company company) {
88   - if (company.getId() == null)
  82 + if (company.getId() == null) {
89 83 return AjaxResult.error("id为空！");
  84 + }
90 85 String[] warehouse = company.getWarehouseCode().split(",");
91 86 LambdaQueryWrapper<WarehouseCompany> lambdaQueryWrapper = Wrappers.lambdaQuery();
92 87 warehouseCompanyService.remove(lambdaQueryWrapper.eq(WarehouseCompany::getCompanyId, company.getId()));
... ... @@ -117,28 +112,4 @@ public class CompanyServiceImpl extends ServiceImpl&lt;CompanyMapper, Company&gt; impl
117 112 public List<Company> selectListEntityByEqual(Company condition) {
118 113 return companyMapper.selectListEntityByEqual(condition);
119 114 }
120   -
121   - @Override
122   - public AjaxResult erpAddCompany() {
123   - List<Organization> organizationList = basisService.getOrganization(0);
124   - if (!organizationList.isEmpty()) {
125   - for (Organization organization : organizationList) {
126   - Company company = new Company();
127   - company.setId(organization.getOrganizationId());
128   - company.setCode(organization.getOrganizationCode());
129   - company.setWarehouseCode("XY0001");
130   - company.setName(organization.getOrganizationName());
131   - LambdaQueryWrapper<Company> queryWrapper = Wrappers.lambdaQuery(company);
132   - List<Company> companyList = list(queryWrapper);
133   - if (companyList.isEmpty()) {
134   - if (!save(company)) {
135   - throw new BusinessException("保存库存组织失败");
136   - }
137   - } else {
138   - System.out.println("货主"+organization.getOrganizationName()+"已存在");
139   - }
140   - }
141   - }
142   - return null;
143   - }
144 115 }
... ...
src/main/java/com/huaheng/pc/config/location/controller/LocationController.java
  View file @8cf81d8
... ... @@ -33,8 +33,10 @@ import org.springframework.ui.ModelMap;
33 33 import org.springframework.web.bind.annotation.*;
34 34  
35 35 import javax.annotation.Resource;
  36 +import java.math.BigDecimal;
36 37 import java.util.ArrayList;
37 38 import java.util.List;
  39 +import java.util.stream.Collectors;
38 40  
39 41 @Api(tags={"库位操作类"})
40 42 @Controller
... ... @@ -237,10 +239,6 @@ public class LocationController extends BaseController {
237 239 inventoryDetailLambda.eq(InventoryDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
238 240 List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(inventoryDetailLambda);
239 241  
240   - LambdaQueryWrapper<Material> materialLambda = Wrappers.lambdaQuery();
241   - materialLambda.eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode());
242   - List<Material> materialList = materialService.list(materialLambda);
243   -
244 242 for(Location location1 : locations) {
245 243 InventoryDetail inventoryDetail = null;
246 244 String materialName = null;
... ... @@ -249,18 +247,16 @@ public class LocationController extends BaseController {
249 247 inventoryDetail = inventoryDetail2;
250 248 }
251 249 }
252   - if (inventoryDetail != null){
253   - for (Material material : materialList) {
254   - if (material.getCode().equals(inventoryDetail.getMaterialCode())){
255   - materialName = material.getName();
256   - break;
257   - }
258   - }
259   - }
  250 + List<InventoryDetail> inventoryDetails = inventoryDetailList.stream().filter(inventoryDetail1 ->
  251 + inventoryDetail1.getLocationCode().equals(location1.getCode())).collect(Collectors.toList());
260 252  
261 253 int userDef3 = 0;
262 254 String status = location1.getStatus();
263 255 String containerCode = location1.getContainerCode();
  256 + List<String> materialNameList = inventoryDetails.stream().map(InventoryDetail::getMaterialName).collect(Collectors.toList());
  257 + List<String> batchList = inventoryDetails.stream().map(InventoryDetail::getBatch).collect(Collectors.toList());
  258 + List<String> materialCodeList = inventoryDetails.stream().map(InventoryDetail::getMaterialCode).collect(Collectors.toList());
  259 + List<BigDecimal> qtyList = inventoryDetails.stream().map(InventoryDetail::getQty).collect(Collectors.toList());
264 260 if (status.equals("empty")) {
265 261 if(StringUtils.isEmpty(containerCode)) {
266 262 userDef3 = LocationStatus.IDLE_EMPTY_LOCATION;
... ... @@ -268,10 +264,10 @@ public class LocationController extends BaseController {
268 264 if(inventoryDetail == null) {
269 265 userDef3 = LocationStatus.IDLE_EMPTY_CONTAINER;
270 266 } else {
271   - location1.setMaterialName(materialName);
272   - location1.setMaterialCode(inventoryDetail.getMaterialCode());
273   - location1.setBatch(inventoryDetail.getBatch());
274   - location1.setQty(String.valueOf(inventoryDetail.getQty()));
  267 + location1.setMaterialName(materialNameList);
  268 + location1.setMaterialCode(materialCodeList);
  269 + location1.setBatch(batchList);
  270 + location1.setQty(qtyList);
275 271 userDef3 = LocationStatus.IDLE_FULL_CONTAINER;
276 272 }
277 273 }
... ... @@ -282,10 +278,10 @@ public class LocationController extends BaseController {
282 278 if(inventoryDetail == null) {
283 279 userDef3 = LocationStatus.LOCK_EMPTY_CONTAINER;
284 280 } else {
285   - location1.setMaterialName(materialName);
286   - location1.setMaterialCode(inventoryDetail.getMaterialCode());
287   - location1.setBatch(inventoryDetail.getBatch());
288   - location1.setQty(String.valueOf(inventoryDetail.getQty()));
  281 + location1.setMaterialName(materialNameList);
  282 + location1.setMaterialCode(materialCodeList);
  283 + location1.setBatch(batchList);
  284 + location1.setQty(qtyList);
289 285 userDef3 = LocationStatus.LOCK_FULL_CONTAINER;
290 286 }
291 287 }
... ... @@ -298,10 +294,10 @@ public class LocationController extends BaseController {
298 294 if(inventoryDetail == null) {
299 295 userDef3 = LocationStatus.DISABLE_EMPTY_CONTAINER;
300 296 } else {
301   - location1.setMaterialName(materialName);
302   - location1.setMaterialCode(inventoryDetail.getMaterialCode());
303   - location1.setBatch(inventoryDetail.getBatch());
304   - location1.setQty(String.valueOf(inventoryDetail.getQty()));
  297 + location1.setMaterialName(materialNameList);
  298 + location1.setMaterialCode(materialCodeList);
  299 + location1.setBatch(batchList);
  300 + location1.setQty(qtyList);
305 301 userDef3 = LocationStatus.DISABLE_FULL_CONTAINER;
306 302 }
307 303 }
... ...
src/main/java/com/huaheng/pc/config/location/domain/Location.java
  View file @8cf81d8
... ... @@ -5,7 +5,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
5 5 import com.baomidou.mybatisplus.annotation.TableId;
6 6 import com.baomidou.mybatisplus.annotation.TableName;
7 7 import java.io.Serializable;
  8 +import java.math.BigDecimal;
8 9 import java.util.Date;
  10 +import java.util.List;
  11 +
9 12 import lombok.Data;
10 13 import org.springframework.transaction.annotation.Transactional;
11 14  
... ... @@ -181,13 +184,17 @@ public class Location implements Serializable {
181 184 private Boolean deleted;
182 185  
183 186  
184   - private transient String materialCode;
  187 + @TableField(exist = false)
  188 + private List<String> materialCode;
185 189  
186   - private transient String materialName;
  190 + @TableField(exist = false)
  191 + private List<String> materialName;
187 192  
188   - private transient String batch;
  193 + @TableField(exist = false)
  194 + private List<String> batch;
189 195  
190   - private transient String qty;
  196 + @TableField(exist = false)
  197 + private List<BigDecimal> qty;
191 198  
192 199 private static final long serialVersionUID = 1L;
193 200 }
194 201 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/location/mapper/LocationMapper.java
  View file @8cf81d8
... ... @@ -24,4 +24,6 @@ public interface LocationMapper extends BaseMapper&lt;Location&gt; {
24 24 //库位利用率
25 25 List<LinkedHashMap<String, Object>> getLocationProp();
26 26  
  27 + List<Location> pickLocation();
  28 +
27 29 }
28 30 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/location/service/LocationService.java
  View file @8cf81d8
... ... @@ -67,4 +67,11 @@ public interface LocationService extends IService&lt;Location&gt;{
67 67 * @return
68 68 */
69 69 Location findLocationByCode(String code);
  70 +
  71 +
  72 + /**
  73 + * 查询空闲可用的库位用来补充入库
  74 + * @return location
  75 + */
  76 + List<Location> pickLocation();
70 77 }
... ...
src/main/java/com/huaheng/pc/config/location/service/LocationServiceImpl.java
  View file @8cf81d8
... ... @@ -263,4 +263,10 @@ public class LocationServiceImpl extends ServiceImpl&lt;LocationMapper, Location&gt; i
263 263 return getOne(queryWrapper);
264 264 }
265 265  
  266 + @Override
  267 + public List<Location> pickLocation() {
  268 + return locationMapper.pickLocation();
  269 + }
  270 +
  271 +
266 272 }
... ...
src/main/java/com/huaheng/pc/config/material/mapper/MaterialMapper.java
  View file @8cf81d8
... ... @@ -3,6 +3,8 @@ package com.huaheng.pc.config.material.mapper;
3 3 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
4 4 import com.huaheng.pc.config.material.domain.Material;
5 5  
  6 +import java.util.List;
  7 +
6 8 public interface MaterialMapper extends BaseMapper<Material> {
7 9  
8 10 /**
... ... @@ -11,4 +13,10 @@ public interface MaterialMapper extends BaseMapper&lt;Material&gt; {
11 13 * @return Material
12 14 */
13 15 Material findAllByCode(String code);
  16 +
  17 + /**
  18 + * 根据编码查询物料
  19 + * @return Material
  20 + */
  21 + List<Material> findLatest();
14 22 }
15 23 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/config/material/service/MaterialService.java
  View file @8cf81d8
... ... @@ -34,6 +34,8 @@ public interface MaterialService extends IService&lt;Material&gt;{
34 34  
35 35 Material findAllByCode(String code);
36 36  
  37 + List<Material> findLatest();
  38 +
37 39 /**
38 40 * 获得物料联想词
39 41 * @param code
... ... @@ -41,9 +43,4 @@ public interface MaterialService extends IService&lt;Material&gt;{
41 43 */
42 44 List<Materialforecast> getMaterialForecast(String code);
43 45  
44   - /**
45   - * 同步ERP物料
46   - * @return
47   - */
48   - AjaxResult addErpMaterial(String dateFrom, String dateTo, Integer pageNum, Integer pageSize, boolean count, String inventoryItemId, String organizationId);
49 46 }
... ...
src/main/java/com/huaheng/pc/config/material/service/MaterialServiceImpl.java
  View file @8cf81d8
... ... @@ -2,8 +2,7 @@ package com.huaheng.pc.config.material.service;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5   -import com.huaheng.api.xinyi.domian.MaterialXinyi;
6   -import com.huaheng.api.xinyi.service.BasisService;
  5 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 6 import com.huaheng.common.exception.BusinessException;
8 7 import com.huaheng.common.support.Convert;
9 8 import com.huaheng.common.utils.StringUtils;
... ... @@ -12,7 +11,8 @@ import com.huaheng.framework.web.domain.AjaxResult;
12 11 import com.huaheng.mobile.shipment.Materialforecast;
13 12 import com.huaheng.pc.config.company.domain.Company;
14 13 import com.huaheng.pc.config.company.service.CompanyService;
15   -import com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple;
  14 +import com.huaheng.pc.config.material.domain.Material;
  15 +import com.huaheng.pc.config.material.mapper.MaterialMapper;
16 16 import com.huaheng.pc.config.materialType.domain.MaterialType;
17 17 import com.huaheng.pc.config.materialType.service.MaterialTypeService;
18 18 import com.huaheng.pc.config.materialUnit.domain.MaterialUnit;
... ... @@ -22,17 +22,13 @@ import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
22 22 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
23 23 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
24 24 import org.springframework.stereotype.Service;
  25 +
25 26 import javax.annotation.Resource;
26   -import java.lang.ref.WeakReference;
27 27 import java.util.ArrayList;
28 28 import java.util.Date;
29 29 import java.util.List;
30 30 import java.util.Map;
31 31  
32   -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
33   -import com.huaheng.pc.config.material.mapper.MaterialMapper;
34   -import com.huaheng.pc.config.material.domain.Material;
35   -
36 32 @Service
37 33 public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, Material> implements MaterialService{
38 34  
... ... @@ -47,8 +43,6 @@ public class MaterialServiceImpl extends ServiceImpl&lt;MaterialMapper, Material&gt; i
47 43 @Resource
48 44 private InventoryDetailService inventoryDetailService;
49 45 @Resource
50   - private BasisService basisService;
51   - @Resource
52 46 private CompanyService companyService;
53 47  
54 48 @Override
... ... @@ -174,6 +168,11 @@ public class MaterialServiceImpl extends ServiceImpl&lt;MaterialMapper, Material&gt; i
174 168 return materialMapper.findAllByCode(code);
175 169 }
176 170  
  171 + @Override
  172 + public List<Material> findLatest() {
  173 + return materialMapper.findLatest();
  174 + }
  175 +
177 176 /**
178 177 * 获得物料联想词
179 178 *
... ... @@ -214,44 +213,6 @@ public class MaterialServiceImpl extends ServiceImpl&lt;MaterialMapper, Material&gt; i
214 213 }
215 214  
216 215 /**
217   - * 同步ERP物料
218   - * @param dateFrom 最后更新日期从(YYYY-MM-DD)
219   - * @param dateTo 最后更新日期至(YYYY-MM-DD)
220   - * @param pageNum 当前页
221   - * @param pageSize 每页行数
222   - * @param count 查询总行数标识
223   - * @param inventoryItemId 物料id
224   - * @param organizationId 库存组织id
225   - * @return
226   - */
227   - @Override
228   - public AjaxResult addErpMaterial(String dateFrom, String dateTo, Integer pageNum, Integer pageSize, boolean count, String inventoryItemId, String organizationId) {
229   - List<MaterialXinyi> materialXinyiList = basisService.getItems(dateFrom, dateTo, pageNum, pageSize, count, 0, inventoryItemId, organizationId);
230   - for (MaterialXinyi materialXinyi : materialXinyiList) {
231   - Material material = new Material();
232   - material.setCode(materialXinyi.getItemNumber());
233   - Company company = new Company();
234   - if (StringUtils.isNotNull(organizationId)) {
235   - company = companyService.getById(materialXinyi.getOrganizationId());
236   - } else {
237   - company = companyService.getById(organizationId);
238   - }
239   - material.setCompanyCode(company.getCode());
240   - material.setWarehouseCode("XY0001");
241   - material.setName(materialXinyi.getItemDesc());
242   - material.setUnit(materialXinyi.getPrimaryUnitOfMeasure());
243   - material.setCreated(new Date());
244   - material.setCreatedBy("erp");
245   - material.setLastUpdated(new Date());
246   - material.setLastUpdatedBy("erp");
247   - if (!save(material)) {
248   - throw new BusinessException("保存物料失败");
249   - }
250   - }
251   - return AjaxResult.success("更新成功");
252   - }
253   -
254   - /**
255 216 * 生成物料编码
256 217 * @param code
257 218 * @return
... ...
src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeService.java
  View file @8cf81d8
... ... @@ -3,6 +3,9 @@ package com.huaheng.pc.config.shipmentType.service;
3 3 import com.baomidou.mybatisplus.extension.service.IService;
4 4 import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
5 5  
  6 +import java.util.List;
  7 +import java.util.Map;
  8 +
6 9 public interface ShipmentTypeService extends IService<ShipmentType>{
7 10  
8 11 /**
... ... @@ -12,4 +15,6 @@ public interface ShipmentTypeService extends IService&lt;ShipmentType&gt;{
12 15 * @return 是否复制成功
13 16 */
14 17 boolean ShipmentTypeCopy(String warehouseCode, String newWarehouseCode);
  18 +
  19 + List<Map<String, Object>> getType();
15 20 }
... ...
src/main/java/com/huaheng/pc/config/shipmentType/service/ShipmentTypeServiceImpl.java
  View file @8cf81d8
... ... @@ -3,6 +3,9 @@ package com.huaheng.pc.config.shipmentType.service;
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
5 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  6 +import com.huaheng.common.utils.StringUtils;
  7 +import com.huaheng.common.utils.security.ShiroUtils;
  8 +import com.huaheng.pc.config.receiptType.domain.ReceiptType;
6 9 import com.huaheng.pc.config.shipmentPreference.domain.ShipmentPreference;
7 10 import com.huaheng.pc.config.shipmentType.domain.ShipmentType;
8 11 import com.huaheng.pc.config.shipmentType.mapper.ShipmentTypeMapper;
... ... @@ -10,8 +13,9 @@ import org.springframework.stereotype.Service;
10 13 import org.springframework.transaction.annotation.Transactional;
11 14  
12 15 import java.util.List;
  16 +import java.util.Map;
13 17  
14   -@Service
  18 +@Service("ShipmentTypeService")
15 19 public class ShipmentTypeServiceImpl extends ServiceImpl<ShipmentTypeMapper, ShipmentType> implements ShipmentTypeService {
16 20  
17 21 /**
... ... @@ -48,4 +52,11 @@ public class ShipmentTypeServiceImpl extends ServiceImpl&lt;ShipmentTypeMapper, Shi
48 52 return false;
49 53 }
50 54 }
  55 +
  56 + public List<Map<String, Object>> getType(){
  57 + LambdaQueryWrapper<ShipmentType> lambdaQueryWrapper = Wrappers.lambdaQuery();
  58 + lambdaQueryWrapper.eq(StringUtils.isNotEmpty(ShiroUtils.getWarehouseCode()),ShipmentType::getWarehouseCode, ShiroUtils.getWarehouseCode())
  59 + .in(StringUtils.isNotEmpty(ShiroUtils.getCompanyCodeList()),ShipmentType::getCompanyCode, ShiroUtils.getCompanyCodeList());
  60 + return this.listMaps(lambdaQueryWrapper);
  61 + }
51 62 }
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderService.java
  View file @8cf81d8
... ... @@ -5,6 +5,8 @@ import com.huaheng.framework.web.domain.AjaxResult;
5 5 import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
6 6 import org.springframework.stereotype.Service;
7 7  
  8 +import java.math.BigDecimal;
  9 +
8 10 @Service
9 11 public interface InventoryHeaderService extends IService<InventoryHeader> {
10 12  
... ... @@ -43,6 +45,8 @@ public interface InventoryHeaderService extends IService&lt;InventoryHeader&gt; {
43 45 * @return
44 46 */
45 47 AjaxResult getLocationForecast(String code, int type);
  48 +
  49 + AjaxResult organizationalTransfers(String materialCode, BigDecimal qty, String beforeCompanyCode, String endCompanyCode);
46 50 }
47 51  
48 52  
... ...
src/main/java/com/huaheng/pc/inventory/inventoryHeader/service/InventoryHeaderServiceImpl.java
  View file @8cf81d8
... ... @@ -12,6 +12,8 @@ import com.huaheng.pc.config.container.domain.Container;
12 12 import com.huaheng.pc.config.container.service.ContainerService;
13 13 import com.huaheng.pc.config.location.domain.Location;
14 14 import com.huaheng.pc.config.location.service.LocationService;
  15 +import com.huaheng.pc.config.material.domain.Material;
  16 +import com.huaheng.pc.config.material.service.MaterialService;
15 17 import com.huaheng.pc.config.warehouse.domain.Warehouse;
16 18 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
17 19 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
... ... @@ -28,6 +30,7 @@ import com.huaheng.pc.inventory.inventoryHeader.mapper.InventoryHeaderMapper;
28 30 import org.springframework.transaction.annotation.Transactional;
29 31  
30 32 import javax.annotation.Resource;
  33 +import java.math.BigDecimal;
31 34 import java.util.ArrayList;
32 35 import java.util.Date;
33 36 import java.util.List;
... ... @@ -48,7 +51,8 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
48 51 private LocationService locationService;
49 52 @Resource
50 53 private InventoryDetailService inventoryDetailService;
51   -
  54 + @Resource
  55 + private MaterialService materialService;
52 56  
53 57  
54 58 /**
... ... @@ -119,7 +123,10 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
119 123 }
120 124  
121 125 //判断托盘是否已经存在任务
122   - Integer taskCount = taskHeaderService.UncompleteCount(containerCode);
  126 + LambdaQueryWrapper<TaskHeader> headerQueryWrapper = Wrappers.lambdaQuery();
  127 + headerQueryWrapper.ne(TaskHeader::getStatus, 100)
  128 + .eq(TaskHeader::getContainerCode, containerCode);
  129 + Integer taskCount = taskHeaderService.count(headerQueryWrapper);
123 130 if (taskCount != null && taskCount.intValue() > 0) {
124 131 return AjaxResult.error("容器已存在任务");
125 132 }
... ... @@ -161,6 +168,11 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
161 168 if(taskDetailService.save(taskDetail) == false){
162 169 throw new ServiceException("空托入库任务明细生成失败！");
163 170 }
  171 +
  172 + /**
  173 + * 锁库位
  174 + */
  175 + locationService.updateStatus(loc.getCode(), "lock");
164 176 return AjaxResult.success(taskHeader.getId());
165 177 }
166 178  
... ... @@ -332,51 +344,145 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
332 344 if (StringUtils.isEmpty(companyCode)) {
333 345 return AjaxResult.error("公司编码为空");
334 346 }
335   - List<InventoryDetail> inventoryDetailList = new ArrayList<>();
  347 + List<InventoryDetail> inventories = null;
  348 + List<MobileInventory> mobileInventories = new ArrayList<>();
336 349 int resultType = 0;
337   -
338   - /* 根据物料编码查询库存*/
339   - LambdaQueryWrapper<InventoryDetail> detailLambdaQueryWrapper = Wrappers.lambdaQuery();
340   - detailLambdaQueryWrapper.eq(InventoryDetail::getMaterialCode, code);
341   - inventoryDetailList = inventoryDetailService.list(detailLambdaQueryWrapper);
342   -
343   - if (inventoryDetailList.isEmpty()) {
344   - /* 根据物料名称查询库存*/
345   - detailLambdaQueryWrapper = Wrappers.lambdaQuery();
346   - detailLambdaQueryWrapper.eq(InventoryDetail::getMaterialName, code);
347   - inventoryDetailList = inventoryDetailService.list(detailLambdaQueryWrapper);
  350 + inventories = selectListEntityByMaterialCode(code);
  351 + if(inventories == null || inventories.size() == 0) {
  352 + inventories = selectListEntityByMaterialName(code);
348 353 }
349   - if (inventoryDetailList.isEmpty()) {
350   - /* 根据库位编码查询库存*/
351   - detailLambdaQueryWrapper = Wrappers.lambdaQuery();
352   - detailLambdaQueryWrapper.eq(InventoryDetail::getLocationCode, code);
353   - inventoryDetailList = inventoryDetailService.list(detailLambdaQueryWrapper);
  354 + if(inventories == null || inventories.size() == 0) {
  355 + inventories = selectListEntityByLocationCode(code);
354 356 resultType = 1;
355 357 }
356   - if (inventoryDetailList.isEmpty()) {
357   - /* 根据容器编码查询库存*/
358   - detailLambdaQueryWrapper = Wrappers.lambdaQuery();
359   - detailLambdaQueryWrapper.eq(InventoryDetail::getContainerCode, code);
360   - inventoryDetailList = inventoryDetailService.list(detailLambdaQueryWrapper);
361   - resultType = 1;
  358 + if(inventories == null || inventories.size() == 0) {
  359 + Location location = new Location();
  360 + location.setContainerCode(code);
  361 + location.setWarehouseCode(ShiroUtils.getWarehouseCode());
  362 + location.setDeleted(false);
  363 + LambdaQueryWrapper lamdba6 = Wrappers.lambdaQuery(location);
  364 + Location location1 = locationService.getOne(lamdba6);
  365 + if(location1 != null) {
  366 + inventories = selectListEntityByLocationCode(location1.getCode());
  367 + resultType = 1;
  368 + }
362 369 }
363   - if (!inventoryDetailList.isEmpty()) {
364   - List<MobileInventory> mobileInventories = new ArrayList<>();
365   - for (InventoryDetail inventoryDetail : inventoryDetailList) {
  370 + if(inventories != null && inventories.size() > 0) {
  371 + for(InventoryDetail inventory : inventories) {
366 372 MobileInventory mobileInventory = new MobileInventory();
367   - mobileInventory.setId(inventoryDetail.getInventoryHeaderId());
368   - mobileInventory.setLocationCode(inventoryDetail.getLocationCode());
369   - mobileInventory.setMaterialCode(inventoryDetail.getMaterialCode());
370   - mobileInventory.setMaterialName(inventoryDetail.getMaterialName());
371   - mobileInventory.setQty(inventoryDetail.getQty());
  373 + mobileInventory.setId(inventory.getId());
  374 + mobileInventory.setLocationCode(inventory.getLocationCode());
  375 + mobileInventory.setMaterialCode(inventory.getMaterialCode());
  376 + mobileInventory.setContainerCode(inventory.getContainerCode());
  377 + Material materialCondition = new Material();
  378 + materialCondition.setWarehouseCode(ShiroUtils.getWarehouseCode());
  379 + materialCondition.setDeleted(false);
  380 + materialCondition.setCode(inventory.getMaterialCode());
  381 +// materialCondition.setCompanyCode(companyCode);
  382 + LambdaQueryWrapper lamdba6 = Wrappers.lambdaQuery(materialCondition);
  383 + Material material = materialService.getOne(lamdba6);
  384 + if(material == null) {
  385 + return AjaxResult.error("没有相对应库存");
  386 + }
  387 + mobileInventory.setMaterialName(material.getName());
  388 + mobileInventory.setQty(inventory.getQty());
372 389 mobileInventory.setResultType(resultType);
373   - mobileInventory.setTaskQty(inventoryDetail.getTaskQty());
374   - mobileInventory.setSpecification(inventoryDetail.getMaterialSpec());
  390 + mobileInventory.setTaskQty(inventory.getTaskQty());
  391 + mobileInventory.setSpecification(material.getSpec());
375 392 mobileInventories.add(mobileInventory);
376 393 }
377 394 return AjaxResult.success(mobileInventories);
378 395 }
379   - return AjaxResult.error("没有像相应的库存");
  396 + Location location = new Location();
  397 + location.setCode(code);
  398 + location.setWarehouseCode(ShiroUtils.getWarehouseCode());
  399 + location.setStatus("empty");
  400 + location.setDeleted(false);
  401 + LambdaQueryWrapper lamdba62 = Wrappers.lambdaQuery(location);
  402 + Location location1 = locationService.getOne(lamdba62);
  403 + if(location1 != null) {
  404 + resultType = 2;
  405 + MobileInventory mobileInventory = new MobileInventory();
  406 + mobileInventory.setResultType(resultType);
  407 + mobileInventory.setContainerCode(location1.getContainerCode());
  408 + mobileInventory.setLocationCode(location1.getCode());
  409 + mobileInventory.setContainerCode(location1.getContainerCode());
  410 + mobileInventories.add(mobileInventory);
  411 + return AjaxResult.success(mobileInventories);
  412 + }
  413 + if(inventories == null || inventories.size() == 0) {
  414 + Location condition = new Location();
  415 + condition.setContainerCode(code);
  416 + condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
  417 + condition.setDeleted(false);
  418 + LambdaQueryWrapper lamdba63 = Wrappers.lambdaQuery(condition);
  419 + Location location2 = locationService.getOne(lamdba63);
  420 + if(location2 == null) {
  421 + condition.setCode(code);
  422 + condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
  423 + condition.setDeleted(false);
  424 + }
  425 + if(location2 != null) {
  426 + Container container = new Container();
  427 + container.setCode(location2.getContainerCode());
  428 + container.setStatus("empty");
  429 + LambdaQueryWrapper lamdba6 = Wrappers.lambdaQuery(container);
  430 + container = containerService.getOne(lamdba6);
  431 + if(container != null) {
  432 + resultType = 2;
  433 + MobileInventory mobileInventory = new MobileInventory();
  434 + mobileInventory.setResultType(resultType);
  435 + mobileInventory.setContainerCode(location2.getContainerCode());
  436 + mobileInventory.setLocationCode(location2.getCode());
  437 + mobileInventory.setContainerCode(location2.getContainerCode());
  438 + mobileInventories.add(mobileInventory);
  439 + return AjaxResult.success(mobileInventories);
  440 + }
  441 + }
  442 + }
  443 + return AjaxResult.error("没有相对应库存");
  444 + }
  445 +
  446 + public List<InventoryDetail> selectListEntityByMaterialName(String materialName) {
  447 + Material material = new Material();
  448 + material.setWarehouseCode(ShiroUtils.getWarehouseCode());
  449 + material.setEnable(true);
  450 + material.setDeleted(false);
  451 + if(materialName.contains(" ")) {
  452 + String materialinfos[] = materialName.split(" ");
  453 + materialName = materialinfos[0];
  454 + material.setSpec(materialinfos[1]);
  455 + }
  456 + material.setName(materialName);
  457 + LambdaQueryWrapper lamdba62 = Wrappers.lambdaQuery(material);
  458 + Material result= materialService.getOne(lamdba62);
  459 + if(result == null) {
  460 + return null;
  461 + }
  462 + InventoryDetail condition = new InventoryDetail();
  463 + condition.setMaterialCode(result.getCode());
  464 + condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
  465 + LambdaQueryWrapper lamdba6 = Wrappers.lambdaQuery(condition);
  466 + List<InventoryDetail> inventories = inventoryDetailService.list(lamdba6);
  467 + return inventories;
  468 + }
  469 +
  470 + public List<InventoryDetail> selectListEntityByMaterialCode(String materialCode) {
  471 + InventoryDetail condition = new InventoryDetail();
  472 + condition.setMaterialCode(materialCode);
  473 + condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
  474 + LambdaQueryWrapper lamdba6 = Wrappers.lambdaQuery(condition);
  475 + List<InventoryDetail> inventories = inventoryDetailService.list(lamdba6);
  476 + return inventories;
  477 + }
  478 +
  479 + public List<InventoryDetail> selectListEntityByLocationCode(String locationCode) {
  480 + InventoryDetail condition = new InventoryDetail();
  481 + condition.setLocationCode(locationCode);
  482 + condition.setWarehouseCode(ShiroUtils.getWarehouseCode());
  483 + LambdaQueryWrapper lamdba6 = Wrappers.lambdaQuery(condition);
  484 + List<InventoryDetail> inventories = inventoryDetailService.list(lamdba6);
  485 + return inventories;
380 486 }
381 487  
382 488 /**
... ... @@ -428,6 +534,61 @@ public class InventoryHeaderServiceImpl extends ServiceImpl&lt;InventoryHeaderMappe
428 534 return AjaxResult.success(inventoryDetailList);
429 535 }
430 536  
  537 + @Override
  538 + @Transactional(rollbackFor = Exception.class)
  539 + public AjaxResult organizationalTransfers(String materialCode, BigDecimal qty, String beforeCompanyCode, String endCompanyCode) {
  540 + /* 查询库存*/
  541 + LambdaQueryWrapper<InventoryDetail> detailLambdaQueryWrapper = Wrappers.lambdaQuery();
  542 + detailLambdaQueryWrapper.eq(InventoryDetail::getMaterialCode, materialCode)
  543 + .eq(InventoryDetail::getCompanyCode, beforeCompanyCode);
  544 + List<InventoryDetail> detailList = inventoryDetailService.list(detailLambdaQueryWrapper);
  545 +
  546 + /* 计算该物料总数量*/
  547 + BigDecimal totalQty = new BigDecimal(0);
  548 + for (InventoryDetail inventoryDetail : detailList) {
  549 + totalQty = totalQty.add(inventoryDetail.getQty());
  550 + }
  551 +
  552 + if (totalQty.compareTo(qty) < 1) {
  553 + return AjaxResult.error("库存数量不足");
  554 + } else {
  555 + /**
  556 + * 遍历库存，当数量大于0时，执行调拨
  557 + * 库存单条记录数量小于调拨数量时，copy实体修改新实体货主编码 添加新库存记录删除原库存、调拨数量减去记录数量
  558 + * 库存单条记录数量等于调拨数量时，copy实体修改新实体货主编码 添加新库存记录删除原库存、调拨数量减去记录数量
  559 + * 库存单条记录数量大于调拨数量时，copy实体修改新实体货主编码 库存数量，原实体数量更新，更新两个实体
  560 + */
  561 + for (InventoryDetail inventoryDetail : detailList) {
  562 + if (qty.compareTo(new BigDecimal(0)) == 1 ) {
  563 + if (inventoryDetail.getQty().compareTo(qty) == 1) {
  564 + InventoryDetail inventoryDetail1 = inventoryDetail;
  565 + inventoryDetail1.setId(null);
  566 + inventoryDetail1.setCompanyCode(endCompanyCode);
  567 + qty = qty.subtract(inventoryDetail.getQty());
  568 + inventoryDetailService.removeById(inventoryDetail.getId());
  569 + inventoryDetailService.save(inventoryDetail1);
  570 + } else if (inventoryDetail.getQty().compareTo(qty) == 0){
  571 + InventoryDetail inventoryDetail1 = inventoryDetail;
  572 + inventoryDetail1.setId(null);
  573 + inventoryDetail1.setCompanyCode(endCompanyCode);
  574 + qty = qty.subtract(inventoryDetail.getQty());
  575 + inventoryDetailService.removeById(inventoryDetail.getId());
  576 + inventoryDetailService.save(inventoryDetail1);
  577 + } else if (inventoryDetail.getQty().compareTo(qty) == -1) {
  578 + InventoryDetail inventoryDetail1 = inventoryDetail;
  579 + inventoryDetail1.setQty(qty);
  580 + inventoryDetail1.setCompanyCode(endCompanyCode);
  581 + inventoryDetail1.setId(null);
  582 + inventoryDetail.setQty(inventoryDetail.getQty().subtract(qty));
  583 + inventoryDetailService.updateById(inventoryDetail);
  584 + inventoryDetailService.save(inventoryDetail1);
  585 + }
  586 + }
  587 + }
  588 + }
  589 + return AjaxResult.success("");
  590 + }
  591 +
431 592  
432 593 }
433 594  
... ...
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
  View file @8cf81d8
... ... @@ -5,7 +5,6 @@ import com.huaheng.pc.config.company.service.CompanyService;
5 5 import com.huaheng.pc.config.wcsscanbarcode.service.WcsscanbarcodeService;
6 6 import com.huaheng.pc.monitor.job.service.IJobLogService;
7 7 import com.huaheng.pc.monitor.operlog.service.IOperLogService;
8   -import org.hibernate.validator.internal.util.logging.Log_$logger;
9 8 import org.springframework.beans.factory.annotation.Autowired;
10 9 import org.springframework.stereotype.Component;
11 10  
... ... @@ -42,15 +41,4 @@ public class RyTask {
42 41 System.out.println("开始同步物料");
43 42 }
44 43  
45   - public void refreshBarCode(){
46   - System.out.println("刷新扫描容器表");
47   - wcsscanbarcodeService.refresh();
48   - }
49   -
50   - /**
51   - * 同步货主(库存组织)
52   - */
53   - public void synchroCompany(){
54   - companyService.erpAddCompany();
55   - }
56 44 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailService.java
  View file @8cf81d8
1 1 package com.huaheng.pc.receipt.receiptContainerDetail.service;
2 2  
3 3 import com.huaheng.framework.web.domain.AjaxResult;
  4 +import com.huaheng.mobile.receipt.ReceiptBill;
4 5 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
5 6 import com.baomidou.mybatisplus.extension.service.IService;
6 7  
... ... @@ -23,11 +24,5 @@ public interface ReceiptContainerDetailService extends IService&lt;ReceiptContainer
23 24 */
24 25 Boolean detailRemove(List<Integer> idList);
25 26  
26   - /**
27   - * 移动端扫描入库单
28   - * @param code
29   - * @return
30   - */
31   - AjaxResult scanReceiptCode(String code);
32   -
  27 + List<Integer> insertTodayReceiptcContainerDetail(int headerId, int receiptId, List<Integer> receiptDetailId, List<ReceiptBill> receiptBills);
33 28 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerDetail/service/ReceiptContainerDetailServiceImpl.java
  View file @8cf81d8
... ... @@ -7,6 +7,9 @@ import com.huaheng.common.constant.QuantityConstant;
7 7 import com.huaheng.common.exception.service.ServiceException;
8 8 import com.huaheng.common.utils.security.ShiroUtils;
9 9 import com.huaheng.framework.web.domain.AjaxResult;
  10 +import com.huaheng.mobile.receipt.ReceiptBill;
  11 +import com.huaheng.pc.config.material.domain.Material;
  12 +import com.huaheng.pc.config.material.service.MaterialService;
10 13 import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDetail;
11 14 import com.huaheng.pc.receipt.receiptContainerDetail.mapper.ReceiptContainerDetailMapper;
12 15 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
... ... @@ -19,6 +22,7 @@ import org.springframework.stereotype.Service;
19 22 import org.springframework.web.bind.annotation.ResponseBody;
20 23  
21 24 import javax.annotation.Resource;
  25 +import java.util.ArrayList;
22 26 import java.util.List;
23 27 import java.util.Map;
24 28 @Service
... ... @@ -30,6 +34,8 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
30 34 private ReceiptHeaderService receiptHeaderService;
31 35 @Resource
32 36 private ReceiptContainerHeaderService receiptContainerHeaderService;
  37 + @Resource
  38 + private MaterialService materialService;
33 39 /**
34 40 * 根据入库单编码查询入库组盘明细
35 41 * @param receiptCode 入库单编码
... ... @@ -100,17 +106,65 @@ public class ReceiptContainerDetailServiceImpl extends ServiceImpl&lt;ReceiptContai
100 106 }
101 107  
102 108  
103   - /**
104   - * 移动端收货
105   - *
106   - * @param code
107   - * @return
108   - */
  109 +// /**
  110 +// * 移动端收货
  111 +// *
  112 +// * @param code
  113 +// * @return
  114 +// */
  115 +// @Override
  116 +// public AjaxResult scanReceiptCode(String code) {
  117 +// LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  118 +// lambdaQueryWrapper.eq(ReceiptDetail::getReceiptCode, code);
  119 +// List<ReceiptDetail> receiptContainerDetails = list(lambdaQueryWrapper);
  120 +// return AjaxResult.success(receiptContainerDetails);
  121 +// }
  122 +
  123 + /**保存到组盘详细*/
109 124 @Override
110   - public AjaxResult scanReceiptCode(String code) {
111   - LambdaQueryWrapper<ReceiptContainerDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
112   - lambdaQueryWrapper.eq(ReceiptContainerDetail::getReceiptCode, code);
113   - List<ReceiptContainerDetail> receiptContainerDetails = list(lambdaQueryWrapper);
114   - return AjaxResult.success(receiptContainerDetails);
  125 + public List<Integer> insertTodayReceiptcContainerDetail(int headerId, int receiptId, List<Integer> receiptDetailId, List<ReceiptBill> receiptBills) {
  126 + List<Integer> mReceiptContainerIds = new ArrayList<>();
  127 +
  128 + ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptId);
  129 + if(receiptHeader == null) {
  130 + throw new ServiceException("没有找到入库单表头！");
  131 + }
  132 + for(int i=0; i<receiptBills.size(); i++) {
  133 + ReceiptBill receiptBill = receiptBills.get(i);
  134 + Material condition2 = new Material();
  135 + condition2.setCode(receiptBill.getMaterialCode());
  136 + condition2.setWarehouseCode(ShiroUtils.getWarehouseCode());
  137 + condition2.setDeleted(false);
  138 + condition2.setEnable(true);
  139 + LambdaQueryWrapper<Material> lambdaQueryWrapper = Wrappers.lambdaQuery();
  140 + lambdaQueryWrapper.eq(Material::getCode, receiptBill.getMaterialCode())
  141 + .eq(Material::getWarehouseCode, ShiroUtils.getWarehouseCode());
  142 + Material material = materialService.getOne(lambdaQueryWrapper);
  143 + ReceiptContainerDetail record = new ReceiptContainerDetail();
  144 + record.setReceiptContainerId(headerId);
  145 + record.setReceiptCode(receiptHeader.getCode());
  146 + record.setReceiptId(receiptId);
  147 + record.setReceiptDetailId(receiptDetailId.get(i));
  148 + record.setMaterialCode(receiptBill.getMaterialCode());
  149 + record.setMaterialName(material.getName());
  150 + record.setMaterialSpec(material.getSpec());
  151 + record.setQty(receiptBill.getQty());
  152 + if(receiptBill.getWeight() != null) {
  153 + record.setWeight(receiptBill.getWeight());
  154 + }
  155 + record.setCreatedBy(ShiroUtils.getLoginName());
  156 +
  157 + LambdaQueryWrapper<ReceiptContainerDetail> detailyWrapper = Wrappers.lambdaQuery();
  158 + detailyWrapper.eq(ReceiptContainerDetail::getReceiptContainerId, headerId)
  159 + .eq(ReceiptContainerDetail::getReceiptCode, receiptHeader.getCode());
  160 + ReceiptContainerDetail receiptContainerDetail = getOne(detailyWrapper);
  161 + if(receiptContainerDetail == null) {
  162 + save(record);
  163 + mReceiptContainerIds.add(record.getId());
  164 + } else {
  165 + mReceiptContainerIds.add(receiptContainerDetail.getId());
  166 + }
  167 + }
  168 + return mReceiptContainerIds;
115 169 }
116 170 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderService.java
  View file @8cf81d8
1 1 package com.huaheng.pc.receipt.receiptContainerHeader.service;
2 2  
3 3 import com.huaheng.framework.web.domain.AjaxResult;
  4 +import com.huaheng.mobile.receipt.ReceiptBill;
4 5 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerHeader;
5 6 import com.baomidou.mybatisplus.extension.service.IService;
6 7 import com.huaheng.pc.receipt.receiptContainerHeader.domain.ReceiptContainerView;
... ... @@ -45,4 +46,6 @@ public interface ReceiptContainerHeaderService extends IService&lt;ReceiptContainer
45 46 * @return
46 47 */
47 48 Boolean mobileCheckLocationCode(ReceiptContainerView record);
  49 +
  50 + int insertTodayReceiptContainerHeader(ReceiptBill receiptBill, String receiptCode);
48 51 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
  View file @8cf81d8
... ... @@ -8,6 +8,7 @@ import com.huaheng.common.constant.QuantityConstant;
8 8 import com.huaheng.common.exception.service.ServiceException;
9 9 import com.huaheng.common.utils.security.ShiroUtils;
10 10 import com.huaheng.framework.web.domain.AjaxResult;
  11 +import com.huaheng.mobile.receipt.ReceiptBill;
11 12 import com.huaheng.pc.config.container.domain.Container;
12 13 import com.huaheng.pc.config.container.domain.ContainerStatus;
13 14 import com.huaheng.pc.config.container.service.ContainerService;
... ... @@ -466,4 +467,36 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
466 467 }
467 468 return code;
468 469 }
  470 +
  471 + @Override
  472 + @Transactional
  473 + public int insertTodayReceiptContainerHeader(ReceiptBill receiptBill, String receiptCode) {
  474 + String receiptContainerCode = receiptBill.getReceiptContainerCode();
  475 + String locationCode = receiptBill.getLocationCode();
  476 + String companyCode = receiptBill.getCompanyCode();
  477 + ReceiptContainerHeader recorder = new ReceiptContainerHeader();
  478 + recorder.setContainerCode(receiptContainerCode);
  479 + recorder.setWarehouseCode(ShiroUtils.getWarehouseCode());
  480 + recorder.setCompanyCode(companyCode);
  481 + recorder.setTaskType(String.valueOf(QuantityConstant.TASK_TYPE_WHOLERECEIPT));
  482 + recorder.setStatus((short) 0);
  483 + recorder.setCreatedBy(ShiroUtils.getLoginName());
  484 +
  485 + LambdaQueryWrapper<ReceiptContainerHeader> receiptContainerHeaderLambada = Wrappers.lambdaQuery();
  486 + receiptContainerHeaderLambada.eq(ReceiptContainerHeader::getContainerCode, receiptContainerCode)
  487 + .eq(ReceiptContainerHeader::getCompanyCode, companyCode)
  488 + .eq(ReceiptContainerHeader::getTaskType, String.valueOf(QuantityConstant.TASK_TYPE_WHOLERECEIPT))
  489 + .eq(ReceiptContainerHeader::getStatus, 0);
  490 +
  491 + ReceiptContainerHeader receiptContainerHeader = getOne(receiptContainerHeaderLambada);
  492 + if(receiptContainerHeader == null) {
  493 + save(recorder);
  494 + } else {
  495 + return receiptContainerHeader.getId();
  496 + }
  497 +
  498 + locationService.updateStatus(locationCode, "lock");
  499 + containerService.updateLocationCodeAndStatus(receiptContainerCode, locationCode, "some");
  500 + return recorder.getId();
  501 + }
469 502 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java
  View file @8cf81d8
1 1 package com.huaheng.pc.receipt.receiptDetail.service;
2 2  
3 3 import com.huaheng.framework.web.domain.AjaxResult;
  4 +import com.huaheng.mobile.receipt.ReceiptBill;
4 5 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
5 6 import com.baomidou.mybatisplus.extension.service.IService;
6 7 import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
... ... @@ -38,4 +39,7 @@ public interface ReceiptDetailService extends IService&lt;ReceiptDetail&gt;{
38 39  
39 40 //以货主维度获取入库量
40 41 List<TaskDetail> getCompanyReceipt();
  42 +
  43 +
  44 + List<Integer> insertTodayReceiptDetail(int headerId, List<ReceiptBill> receiptBills, boolean isCompletedQty, String companyCode);
41 45 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
  View file @8cf81d8
... ... @@ -8,8 +8,11 @@ import com.huaheng.common.support.Convert;
8 8 import com.huaheng.common.utils.StringUtils;
9 9 import com.huaheng.common.utils.security.ShiroUtils;
10 10 import com.huaheng.framework.web.domain.AjaxResult;
  11 +import com.huaheng.mobile.receipt.ReceiptBill;
11 12 import com.huaheng.pc.check.checkHeader.domain.CheckHeader;
12 13 import com.huaheng.pc.check.checkHeader.service.CheckHeaderService;
  14 +import com.huaheng.pc.config.company.domain.Company;
  15 +import com.huaheng.pc.config.company.service.CompanyService;
13 16 import com.huaheng.pc.config.configValue.domain.ConfigValue;
14 17 import com.huaheng.pc.config.configValue.service.ConfigValueService;
15 18 import com.huaheng.pc.config.material.domain.Material;
... ... @@ -32,6 +35,7 @@ import io.swagger.models.auth.In;
32 35 import org.aspectj.weaver.loadtime.Aj;
33 36 import org.springframework.stereotype.Service;
34 37 import javax.annotation.Resource;
  38 +import java.util.ArrayList;
35 39 import java.util.List;
36 40 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
37 41 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
... ... @@ -62,6 +66,8 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
62 66 private ConfigValueService configValueService;
63 67 @Resource
64 68 private ReceiptDetailMapper receiptDetailMapper;
  69 + @Resource
  70 + private CompanyService companyService;
65 71  
66 72 /**
67 73 * 新增入库明细
... ... @@ -69,6 +75,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
69 75 * @return
70 76 */
71 77 @Transactional
  78 + @Override
72 79 public AjaxResult saveReceiptDetaial(ReceiptDetail receiptDetail){
73 80 /* 判断入库头表状态*/
74 81 LambdaQueryWrapper<ReceiptHeader> lambdaReceiptHeader = Wrappers.lambdaQuery();
... ... @@ -203,7 +210,8 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
203 210 //查询头表中绑定的入库类型中的入库流程
204 211 LambdaQueryWrapper<ReceiptType> lambdaReceiptType = Wrappers.lambdaQuery();
205 212 lambdaReceiptType.eq(ReceiptType::getCode, receiptHeader.getReceiptType())
206   - .eq(ReceiptType::getWarehouseCode,ShiroUtils.getWarehouseCode());
  213 + .eq(ReceiptType::getWarehouseCode,ShiroUtils.getWarehouseCode())
  214 + .eq(ReceiptType::getCompanyCode, receiptDetail.getCompanyCode());
207 215 ReceiptType receiptType = receiptTypeService.getOne(lambdaReceiptType);
208 216  
209 217  
... ... @@ -291,6 +299,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
291 299 * 当所有明细表到达该状态时，更新头表状态
292 300 * @param id 头表id
293 301 */
  302 + @Override
294 303 public void updateReceiptHeaderLastStatus(Integer id){
295 304 LambdaQueryWrapper<ReceiptDetail> lambdaDetails = Wrappers.lambdaQuery();
296 305 lambdaDetails.eq(ReceiptDetail::getReceiptId, id);
... ... @@ -324,14 +333,13 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
324 333 }
325 334  
326 335 //若更新状态值小于头状态，更新尾状态否则更新头尾状态
327   - if (minStatus < receiptHeader.getFirstStatus()){
328   - receiptHeader.setLastStatus(minStatus);
329   - } if (maxStatus > receiptHeader.getFirstStatus()){
330   - receiptHeader.setFirstStatus(maxStatus);
331   - receiptHeader.setLastStatus(minStatus);
332   - receiptHeaderService.updateById(receiptHeader);
  336 + receiptHeader.setFirstStatus(maxStatus);
  337 + receiptHeader.setLastStatus(minStatus);
  338 + if (!receiptHeaderService.updateById(receiptHeader)) {
  339 + throw new ServiceException("更新状态失败");
333 340 }
334 341  
  342 +
335 343 }
336 344  
337 345 /**
... ... @@ -386,6 +394,7 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
386 394 return receiptDetailMapper.getCompanyReceipt();
387 395 }
388 396  
  397 +
389 398 /**
390 399 * 判断明细中是否质检
391 400 */
... ... @@ -401,4 +410,32 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
401 410 }
402 411 return false;
403 412 }
  413 +
  414 + @Override
  415 + public List<Integer> insertTodayReceiptDetail(int headerId, List<ReceiptBill> receiptBills, boolean isCompletedQty, String companyCode) {
  416 + List<Integer> mReceiptDetailIds = new ArrayList<>();
  417 + ReceiptHeader receiptHeader = receiptHeaderService.getById(headerId);
  418 +
  419 + for(ReceiptBill receiptBill : receiptBills) {
  420 + ReceiptDetail receiptDetail = new ReceiptDetail();
  421 + receiptDetail.setId(null);
  422 + receiptDetail.setWarehouseCode(ShiroUtils.getWarehouseCode());
  423 + receiptDetail.setCompanyCode(companyCode);
  424 + receiptDetail.setReceiptId(receiptHeader.getId());
  425 + receiptDetail.setReceiptCode(receiptHeader.getCode());
  426 + receiptDetail.setMaterialCode(receiptBill.getMaterialCode());
  427 + receiptDetail.setInventorySts("good");
  428 + receiptDetail.setTotalQty(receiptBill.getQty());
  429 + if(isCompletedQty) {
  430 + receiptDetail.setOpenQty(receiptBill.getQty());
  431 + }
  432 + receiptDetail.setCreatedBy(ShiroUtils.getLoginName());
  433 + receiptDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  434 + receiptDetail.setDeleted(false);
  435 + receiptDetail.setBatch(receiptBill.getBatch());
  436 + save(receiptDetail);
  437 + mReceiptDetailIds.add(receiptDetail.getId());
  438 + }
  439 + return mReceiptDetailIds;
  440 + }
404 441 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @8cf81d8
... ... @@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7   -import com.huaheng.api.xinyi.service.BusinessService;
8 7 import com.huaheng.common.exception.service.ServiceException;
9   -import com.huaheng.common.support.Convert;
10 8 import com.huaheng.common.utils.StringUtils;
11 9 import com.huaheng.common.utils.security.ShiroUtils;
12 10 import com.huaheng.framework.aspectj.lang.annotation.Log;
... ... @@ -16,27 +14,21 @@ import com.huaheng.framework.web.domain.AjaxResult;
16 14 import com.huaheng.framework.web.page.PageDomain;
17 15 import com.huaheng.framework.web.page.TableDataInfo;
18 16 import com.huaheng.framework.web.page.TableSupport;
19   -import com.huaheng.pc.config.company.domain.Company;
20 17 import com.huaheng.pc.config.company.service.CompanyService;
21 18 import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
22 19 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
23 20 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
24 21 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
25   -import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
26 22 import com.huaheng.pc.receipt.receiptHeaderHistory.service.ReceiptHeaderHistoryService;
27 23 import io.swagger.annotations.Api;
28   -import io.swagger.annotations.ApiModel;
29 24 import io.swagger.annotations.ApiOperation;
30 25 import io.swagger.annotations.ApiParam;
31   -import org.apache.ibatis.javassist.compiler.ast.ASTree;
32 26 import org.apache.shiro.authz.annotation.RequiresPermissions;
33 27 import org.springframework.stereotype.Controller;
34 28 import org.springframework.ui.ModelMap;
35 29 import org.springframework.web.bind.annotation.*;
36 30  
37 31 import javax.annotation.Resource;
38   -import javax.swing.text.Keymap;
39   -import java.util.ArrayList;
40 32 import java.util.List;
41 33  
42 34 @Api(tags = "入库单")
... ... @@ -79,11 +71,12 @@ public class ReceiptHeaderController extends BaseController {
79 71  
80 72 lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptHeader::getCreated, createdBegin)
81 73 .le(StringUtils.isNotEmpty(createdEnd), ReceiptHeader::getCreated, createdEnd)
82   - .in(ReceiptHeader::getCompanyCode, ShiroUtils.getCompanyCodeList())
  74 + .in(StringUtils.isNotEmpty(receiptHeader.getCompanyCode()),ReceiptHeader::getCompanyCode, receiptHeader.getCompanyCode())
83 75 .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
84 76 .eq(StringUtils.isNotEmpty(receiptHeader.getReceiptType()),
85 77 ReceiptHeader::getReceiptType, receiptHeader.getReceiptType())
86 78 .eq(StringUtils.isNotEmpty(receiptHeader.getCode()), ReceiptHeader::getCode, receiptHeader.getCode())
  79 + .eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeader::getReferCode, receiptHeader.getReferCode())
87 80 .ge(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
88 81 ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus())
89 82 .le(StringUtils.isNotNull(receiptHeader.getLastStatus()),
... ... @@ -96,17 +89,6 @@ public class ReceiptHeaderController extends BaseController {
96 89 */
97 90 Page<ReceiptHeader> page = new Page<>(pageNum, pageSize);
98 91 IPage<ReceiptHeader> iPage = receiptHeaderService.page(page, lambdaQueryWrapper);
99   - if (iPage.getTotal() == 0) {
100   - if (StringUtils.isEmpty(receiptHeader.getCompanyCode())) {
101   - throw new ServiceException("请选择货主");
102   - } else if (StringUtils.isEmpty(receiptHeader.getReferCode())){
103   - throw new ServiceException("请输入上游系统单号");
104   - } else {
105   - LambdaQueryWrapper<Company> companyQueryWrapper = Wrappers.lambdaQuery();
106   - companyQueryWrapper.eq(Company::getCode, receiptHeader.getCompanyCode());
107   - Company company = companyService.getOne(companyQueryWrapper);
108   - }
109   - }
110 92 return getMpDataTable(iPage.getRecords(),iPage.getTotal());
111 93 } else {
112 94 List<ReceiptHeader> list = receiptHeaderService.list(lambdaQueryWrapper);
... ... @@ -273,7 +255,7 @@ public class ReceiptHeaderController extends BaseController {
273 255 * 入库单打印
274 256 */
275 257 @ApiOperation(value="打印入库单报表", notes="打印入库单报表", httpMethod = "POST")
276   - @RequiresPermissions("receipt:receiptHeader:check")
  258 + @RequiresPermissions("receipt:receiptHeader:report")
277 259 @Log(title = "入库-入库单",operating = "打印入库单报表", action = BusinessType.OTHER)
278 260 @GetMapping("/report/{id}")
279 261 public String report(@ApiParam(name = "id", value = "入库头表id")
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/mapper/ReceiptHeaderMapper.java
  View file @8cf81d8
... ... @@ -9,4 +9,15 @@ public interface ReceiptHeaderMapper extends BaseMapper&lt;ReceiptHeader&gt; {
9 9  
10 10 List<ReceiptHeader> selectListByCreated();
11 11  
  12 + /**
  13 + * 生成入库单编码
  14 + * @return
  15 + */
  16 + String createCode(String receiptType);
  17 +
  18 + /**
  19 + * 获得最新入库单
  20 + * @return
  21 + */
  22 + List<ReceiptHeader> getLatestReceipt();
12 23 }
13 24 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
  View file @8cf81d8
... ... @@ -310,4 +310,64 @@ public class ReceiptHeaderService extends ServiceImpl&lt;ReceiptHeaderMapper, Recei
310 310 return receiptHeaderMapper.selectListByCreated();
311 311 }
312 312  
  313 +
  314 + @Transactional(rollbackFor = Exception.class)
  315 + public Integer createTodayHeader(String companyCode) {
  316 + String receiptType = "PPI";
  317 + String code = null;
  318 + Date now = new Date();
  319 + SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");
  320 + String maxCode = receiptHeaderMapper.createCode(receiptType);
  321 + //如果指定类型的最后的code存在，并且日期一致。那么 code = 入库单类型 + 年月日 + (排序号 + 1)
  322 + if (maxCode != null && maxCode.substring(maxCode.length() - 13, maxCode.length() - 5).equals(df.format(now)))
  323 + {
  324 + Integer Count = Integer.valueOf(maxCode.substring(maxCode.length() - 5, maxCode.length()));
  325 + code = receiptType + df.format(now) + String.format("%05d", Count + 1);
  326 + }
  327 + else
  328 + {
  329 + code = receiptType + df.format(now) + "00001";
  330 + }
  331 + ReceiptHeader receiptHeader = new ReceiptHeader();
  332 + receiptHeader.setId(null);
  333 + receiptHeader.setCode(code);
  334 + receiptHeader.setReceiptType(receiptType);
  335 + receiptHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
  336 + receiptHeader.setCreated(null);
  337 + receiptHeader.setCreatedBy(ShiroUtils.getLoginName());
  338 + receiptHeader.setLastUpdated(null);
  339 + receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  340 + receiptHeader.setFirstStatus(200);
  341 + receiptHeader.setLastStatus(200);
  342 + receiptHeader.setCompanyCode(companyCode);
  343 + this.save(receiptHeader);
  344 + return receiptHeader.getId();
  345 + }
  346 +
  347 + @Transactional(rollbackFor = Exception.class)
  348 + public List<ReceiptHeader> getLatestReceipt() {
  349 + return receiptHeaderMapper.getLatestReceipt();
  350 + }
  351 +
  352 +
  353 + private AjaxResult editReceiveStatus(Integer id) {
  354 + ReceiptHeader receiptHeader = new ReceiptHeader();
  355 + receiptHeader.setId(id);
  356 + receiptHeader.setFirstStatus(900);
  357 + receiptHeader.setLastStatus(900);
  358 + if (!updateById(receiptHeader)) {
  359 + throw new ServiceException("更新头表状态失败");
  360 + } else {
  361 + LambdaQueryWrapper<ReceiptDetail> lambdaQueryWrapper = Wrappers.lambdaQuery();
  362 + lambdaQueryWrapper.eq(ReceiptDetail::getReceiptId, id);
  363 + List<ReceiptDetail> receiptDetails = receiptDetailService.list(lambdaQueryWrapper);
  364 + for (ReceiptDetail receiptDetail : receiptDetails) {
  365 + receiptDetail.setProcessStamp("900");
  366 + }
  367 + if (!receiptDetailService.updateBatchById(receiptDetails)) {
  368 + throw new ServiceException("更新明细失败");
  369 + }
  370 + }
  371 + return AjaxResult.success("");
  372 + }
313 373 }
... ...
src/main/java/com/huaheng/pc/shipment/shipmentDetail/domain/ShipmentDetail.java
  View file @8cf81d8
... ... @@ -307,86 +307,6 @@ public class ShipmentDetail implements Serializable {
307 307  
308 308 private static final long serialVersionUID = 1L;
309 309  
310   - public static final String COL_SHIPMENTID = "shipmentId";
311   -
312   - public static final String COL_WAREHOUSECODE = "warehouseCode";
313   -
314   - public static final String COL_COMPANYCODE = "companyCode";
315   -
316   - public static final String COL_SHIPMENTCODE = "shipmentCode";
317   -
318   - public static final String COL_REFERCODE = "referCode";
319   -
320   - public static final String COL_REFERID = "referId";
321   -
322   - public static final String COL_REFERLINENUM = "referLineNum";
323   -
324   - public static final String COL_MATERIALCODE = "materialCode";
325   -
326   - public static final String COL_MATERIALNAME = "materialName";
327   -
328   - public static final String COL_MATERIALSPEC = "materialSpec";
329   -
330   - public static final String COL_MATERIALUNIT = "materialUnit";
331   -
332   - public static final String COL_SHIPQTY = "shipQty";
333   -
334   - public static final String COL_REQUESTQTY = "requestQty";
335   -
336   - public static final String COL_ALLOCATIONRULE = "allocationRule";
337   -
338   - public static final String COL_REPLENISHMENTRULE = "replenishmentRule";
339   -
340   - public static final String COL_PICKLOCS = "pickLocs";
341   -
342   - public static final String COL_ATTRIBUTE1 = "attribute1";
343   -
344   - public static final String COL_ATTRIBUTE2 = "attribute2";
345   -
346   - public static final String COL_ATTRIBUTE3 = "attribute3";
347   -
348   - public static final String COL_ATTRIBUTE4 = "attribute4";
349   -
350   - public static final String COL_BATCH = "batch";
351   -
352   - public static final String COL_LOT = "lot";
353   -
354   - public static final String COL_PROJECTNO = "projectNo";
355   -
356   - public static final String COL_MANUFACTUREDATE = "manufactureDate";
357   -
358   - public static final String COL_EXPIRATIONDATE = "expirationDate";
359   -
360   - public static final String COL_AGINGDATE = "agingDate";
361   -
362   - public static final String COL_INVENTORYSTS = "inventorySts";
363   -
364   - public static final String COL_DOCKLOC = "dockLoc";
365   -
366   - public static final String COL_PACKINGCLASS = "packingClass";
367   -
368   - public static final String COL_ENABLE = "enable";
369   -
370   - public static final String COL_WAVEID = "waveId";
371   -
372   - public static final String COL_CREATED = "created";
373   -
374   - public static final String COL_CREATEDBY = "createdBy";
375   -
376   - public static final String COL_LASTUPDATED = "lastUpdated";
377   -
378   - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
379   -
380   - public static final String COL_VERSION = "version";
381   -
382   - public static final String COL_USERDEF1 = "userDef1";
383   -
384   - public static final String COL_USERDEF2 = "userDef2";
385   -
386   - public static final String COL_USERDEF3 = "userDef3";
387   -
388   - public static final String COL_PROCESSSTAMP = "processStamp";
389   -
390 310 /**
391 311 * 获取出库单内部行号
392 312 *
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
  View file @8cf81d8
... ... @@ -15,12 +15,16 @@ import com.huaheng.framework.web.domain.AjaxResult;
15 15 import com.huaheng.framework.web.page.PageDomain;
16 16 import com.huaheng.framework.web.page.TableDataInfo;
17 17 import com.huaheng.framework.web.page.TableSupport;
  18 +import com.huaheng.pc.config.company.domain.Company;
  19 +import com.huaheng.pc.config.company.service.CompanyService;
18 20 import com.huaheng.pc.config.waveMaster.domain.WaveMaster;
19 21 import com.huaheng.pc.config.waveMaster.service.WaveMasterService;
  22 +import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
20 23 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
21 24 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
22 25 import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
23 26 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
  27 +import io.swagger.annotations.ApiParam;
24 28 import org.apache.shiro.authz.annotation.RequiresPermissions;
25 29 import org.springframework.beans.factory.annotation.Autowired;
26 30 import org.springframework.stereotype.Controller;
... ... @@ -28,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
28 32 import org.springframework.ui.ModelMap;
29 33 import org.springframework.web.bind.annotation.*;
30 34  
  35 +import javax.annotation.Resource;
31 36 import java.lang.reflect.InvocationTargetException;
32 37 import java.util.List;
33 38  
... ... @@ -40,8 +45,7 @@ import java.util.List;
40 45 */
41 46 @Controller
42 47 @RequestMapping("/shipment/shipmentHeader")
43   -public class ShipmentHeaderController extends BaseController
44   -{
  48 +public class ShipmentHeaderController extends BaseController {
45 49 private String prefix = "shipment/shipmentHeader";
46 50  
47 51 @Autowired
... ... @@ -50,6 +54,8 @@ public class ShipmentHeaderController extends BaseController
50 54 private ShipmentDetailService shipmentDetailService;
51 55 @Autowired
52 56 private WaveMasterService waveMasterService;
  57 + @Resource
  58 + private CompanyService companyService;
53 59  
54 60  
55 61 @RequiresPermissions("shipment:bill:view")
... ... @@ -98,7 +104,7 @@ public class ShipmentHeaderController extends BaseController
98 104 return getDataTable(list);
99 105 }
100 106 }
101   -
  107 +
102 108 /**
103 109 * 新增出库单主
104 110 */
... ... @@ -163,10 +169,10 @@ public class ShipmentHeaderController extends BaseController
163 169 @ResponseBody
164 170 @Transactional
165 171 public AjaxResult remove(String ids) throws InvocationTargetException, IllegalAccessException {
166   - if (StringUtils.isEmpty(ids))
  172 + if (StringUtils.isEmpty(ids)) {
167 173 return AjaxResult.error("id不能为空");
168   - for (Integer id : Convert.toIntArray(ids))
169   - {
  174 + }
  175 + for (Integer id : Convert.toIntArray(ids)) {
170 176 ShipmentHeader shipmentHeader=shipmentHeaderService.getById(id);
171 177 if(shipmentHeader == null){
172 178 return AjaxResult.error("id为"+id+"的主单单据找不到");
... ... @@ -287,8 +293,9 @@ public class ShipmentHeaderController extends BaseController
287 293 @ResponseBody
288 294 @Transactional
289 295 public AjaxResult analysis(String ids,String code){
290   - if (StringUtils.isEmpty(ids))
  296 + if (StringUtils.isEmpty(ids)) {
291 297 throw new ServiceException("id不能为空");
  298 + }
292 299 if(StringUtils.isEmpty(code)){
293 300 throw new ServiceException("波次不能为空");
294 301 }
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java
  View file @8cf81d8
... ... @@ -71,7 +71,7 @@ public class ShipmentHeader implements Serializable {
71 71 */
72 72 @TableField(value = "referPlatform")
73 73 @ApiModelProperty(value = "订单平台")
74   - private Integer referPlatform;
  74 + private String referPlatform;
75 75  
76 76 /**
77 77 * 主状态
... ... @@ -370,103 +370,4 @@ public class ShipmentHeader implements Serializable {
370 370 @ApiModelProperty(value = "是否删除")
371 371 private Boolean deleted;
372 372  
373   - private static final long serialVersionUID = 1L;
374   -
375   - public static final String COL_WAREHOUSECODE = "warehouseCode";
376   -
377   - public static final String COL_COMPANYCODE = "companyCode";
378   -
379   - public static final String COL_CODE = "code";
380   -
381   - public static final String COL_REFERCODE = "referCode";
382   -
383   - public static final String COL_REFERCODETYPE = "referCodeType";
384   -
385   - public static final String COL_REFERID = "referId";
386   -
387   - public static final String COL_REFERPLATFORM = "referPlatform";
388   -
389   - public static final String COL_FIRSTSTATUS = "firstStatus";
390   -
391   - public static final String COL_LASTSTATUS = "lastStatus";
392   -
393   - public static final String COL_SHIPMENTTYPE = "shipmentType";
394   -
395   - public static final String COL_ROUTE = "route";
396   -
397   - public static final String COL_CUSTOMERCODE = "customerCode";
398   -
399   - public static final String COL_CUSTOMERNAME = "customerName";
400   -
401   - public static final String COL_PRIORITY = "priority";
402   -
403   - public static final String COL_REQUESTEDDELIVERYDATE = "requestedDeliveryDate";
404   -
405   - public static final String COL_SCHEDULEDSHIPDATE = "scheduledShipDate";
406   -
407   - public static final String COL_ACTUALSHIPDATETIME = "actualShipDateTime";
408   -
409   - public static final String COL_ACTUALDELIVERYDATE = "actualDeliveryDate";
410   -
411   - public static final String COL_DELIVERYNOTE = "deliveryNote";
412   -
413   - public static final String COL_REJECTIONNOTE = "rejectionNote";
414   -
415   - public static final String COL_WAVEID = "waveId";
416   -
417   - public static final String COL_SHIPDOCK = "shipDock";
418   -
419   - public static final String COL_ALLOCATECOMPLETE = "allocateComplete";
420   -
421   - public static final String COL_TOTALWEIGHT = "totalWeight";
422   -
423   - public static final String COL_TOTALQTY = "totalQty";
424   -
425   - public static final String COL_TOTALVOLUME = "totalVolume";
426   -
427   - public static final String COL_TOTALLINES = "totalLines";
428   -
429   - public static final String COL_PROCESSTYPE = "processType";
430   -
431   - public static final String COL_LASTWAVEID = "lastWaveId";
432   -
433   - public static final String COL_SIGNVALUE = "signValue";
434   -
435   - public static final String COL_CARRIERCODE = "carrierCode";
436   -
437   - public static final String COL_CARRIERSERVICE = "carrierService";
438   -
439   - public static final String COL_SHIPMENTNOTE = "shipmentNote";
440   -
441   - public static final String COL_CARRIERSERVER = "carrierServer";
442   -
443   - public static final String COL_CARRIERSERVERNAME = "carrierServerName";
444   -
445   - public static final String COL_PLATENUMBER = "plateNumber";
446   -
447   - public static final String COL_CARMODEL = "carModel";
448   -
449   - public static final String COL_DRIVERNAME = "driverName";
450   -
451   - public static final String COL_DRIVERTEL = "driverTel";
452   -
453   - public static final String COL_CREATED = "created";
454   -
455   - public static final String COL_CREATEDBY = "createdBy";
456   -
457   - public static final String COL_LASTUPDATED = "lastUpdated";
458   -
459   - public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
460   -
461   - public static final String COL_VERSION = "version";
462   -
463   - public static final String COL_USERDEF1 = "userDef1";
464   -
465   - public static final String COL_USERDEF2 = "userDef2";
466   -
467   - public static final String COL_USERDEF3 = "userDef3";
468   -
469   - public static final String COL_PROCESSSTAMP = "processStamp";
470   -
471   - public static final String COL_DELETED = "deleted";
472 373 }
473 374 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderService.java
  View file @8cf81d8
... ... @@ -25,5 +25,4 @@ public interface ShipmentHeaderService extends IService&lt;ShipmentHeader&gt;{
25 25  
26 26 List<ShipmentHeader> selectListByCreated();
27 27  
28   -
29 28 }
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/service/ShipmentHeaderServiceImpl.java
  View file @8cf81d8
... ... @@ -2,25 +2,30 @@ package com.huaheng.pc.shipment.shipmentHeader.service;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 6 import com.huaheng.common.constant.QuantityConstant;
6 7 import com.huaheng.common.exception.service.ServiceException;
7 8 import com.huaheng.common.support.Convert;
8 9 import com.huaheng.common.utils.security.ShiroUtils;
9 10 import com.huaheng.framework.web.domain.AjaxResult;
  11 +import com.huaheng.pc.config.company.service.CompanyService;
  12 +import com.huaheng.pc.config.material.service.MaterialService;
10 13 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
11 14 import com.huaheng.pc.shipment.shipmentDetail.domain.ShipmentDetail;
12 15 import com.huaheng.pc.shipment.shipmentDetail.service.ShipmentDetailService;
13 16 import com.huaheng.pc.shipment.shipmentDetailHistory.domain.ShipmentDetailHistory;
14 17 import com.huaheng.pc.shipment.shipmentDetailHistory.service.ShipmentDetailHistoryService;
  18 +import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
  19 +import com.huaheng.pc.shipment.shipmentHeader.mapper.ShipmentHeaderMapper;
15 20 import com.huaheng.pc.shipment.shipmentHeaderHistory.domain.ShipmentHeaderHistory;
16 21 import com.huaheng.pc.shipment.shipmentHeaderHistory.service.ShipmentHeaderHistoryService;
17 22 import com.huaheng.pc.system.dict.service.IDictDataService;
18 23 import org.apache.commons.beanutils.BeanUtils;
19   -import org.apache.commons.collections4.QueueUtils;
20 24 import org.springframework.beans.factory.annotation.Autowired;
21 25 import org.springframework.stereotype.Service;
  26 +import org.springframework.transaction.annotation.Transactional;
  27 +
22 28 import javax.annotation.Resource;
23   -import javax.xml.namespace.QName;
24 29 import java.lang.reflect.InvocationTargetException;
25 30 import java.text.SimpleDateFormat;
26 31 import java.util.ArrayList;
... ... @@ -28,12 +33,6 @@ import java.util.Date;
28 33 import java.util.List;
29 34 import java.util.Map;
30 35  
31   -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
32   -import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
33   -import com.huaheng.pc.shipment.shipmentHeader.mapper.ShipmentHeaderMapper;
34   -import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
35   -import org.springframework.transaction.annotation.Transactional;
36   -
37 36 @Service
38 37 public class ShipmentHeaderServiceImpl extends ServiceImpl<ShipmentHeaderMapper, ShipmentHeader> implements ShipmentHeaderService{
39 38  
... ... @@ -49,8 +48,10 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
49 48 private ShipmentHeaderHistoryService shipmentHeaderHistoryService;
50 49 @Autowired
51 50 private ShipmentDetailHistoryService shipmentDetailHistoryService;
52   -
53   -
  51 + @Resource
  52 + private CompanyService companyService;
  53 + @Resource
  54 + private MaterialService materialService;
54 55  
55 56 //新增出库主单
56 57 @Override
... ... @@ -75,6 +76,7 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
75 76  
76 77  
77 78 //根据单据类型建单据号
  79 + @Override
78 80 public String createCode(String shipmentType)
79 81 {
80 82 String code = null;
... ... @@ -228,4 +230,5 @@ public class ShipmentHeaderServiceImpl extends ServiceImpl&lt;ShipmentHeaderMapper,
228 230 public List<ShipmentHeader> selectListByCreated() {
229 231 return shipmentHeaderMapper.selectListByCreated();
230 232 }
  233 +
231 234 }
... ...
src/main/java/com/huaheng/pc/system/dept/domain/Dept.java
  View file @8cf81d8
... ... @@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
8 8 import com.google.common.collect.Maps;
9 9 import lombok.Data;
10 10  
  11 +import java.io.Serializable;
11 12 import java.util.Date;
12 13 import java.util.Map;
13 14  
... ... @@ -18,7 +19,7 @@ import java.util.Map;
18 19 */
19 20 @Data
20 21 @TableName(value = "sys_dept")
21   -public class Dept
  22 +public class Dept implements Serializable
22 23 {
23 24 private static final long serialVersionUID = 1L;
24 25 /** 部门ID */
... ...
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
  View file @8cf81d8
... ... @@ -136,10 +136,10 @@ public class TaskHeaderController extends BaseController {
136 136 @ResponseBody
137 137 public AjaxResult remove(String ids)
138 138 {
139   - if (StringUtils.isEmpty(ids))
  139 + if (StringUtils.isEmpty(ids)) {
140 140 return AjaxResult.error("taskId不能为空");
141   - AjaxResult ajaxResult = taskHeaderService.cancelTask(Convert.toIntArray(ids));
142   - return ajaxResult;
  141 + }
  142 + return taskHeaderService.cancelTask(Convert.toIntArray(ids));
143 143 }
144 144  
145 145  
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderService.java
  View file @8cf81d8
1 1 package com.huaheng.pc.task.taskHeader.service;
2 2  
  3 +import com.baomidou.mybatisplus.extension.service.IService;
3 4 import com.huaheng.framework.web.domain.AjaxResult;
4   -import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
5 5 import com.huaheng.pc.task.taskHeader.domain.MobileTask;
6 6 import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
7 7 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
8   -import com.baomidou.mybatisplus.extension.service.IService;
9   -import javafx.concurrent.Task;
10   -import org.apache.ibatis.annotations.Param;
11 8  
12 9 import java.util.List;
13   -import java.util.Map;
14 10  
15 11 public interface TaskHeaderService extends IService<TaskHeader>{
16 12  
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @8cf81d8
... ... @@ -2,8 +2,8 @@ package com.huaheng.pc.task.taskHeader.service;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
5   -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
6 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7 7 import com.huaheng.api.wcs.service.taskAssignService.TaskAssignService;
8 8 import com.huaheng.common.constant.QuantityConstant;
9 9 import com.huaheng.common.exception.BusinessException;
... ... @@ -13,7 +13,6 @@ import com.huaheng.common.utils.DataUtils;
13 13 import com.huaheng.common.utils.StringUtils;
14 14 import com.huaheng.common.utils.security.ShiroUtils;
15 15 import com.huaheng.framework.web.domain.AjaxResult;
16   -import com.huaheng.pc.config.configWarning.domain.ConfigWarning;
17 16 import com.huaheng.pc.config.configWarning.service.ConfigWarningService;
18 17 import com.huaheng.pc.config.container.domain.Container;
19 18 import com.huaheng.pc.config.container.service.ContainerService;
... ... @@ -21,12 +20,10 @@ import com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity;
21 20 import com.huaheng.pc.config.containerCapacity.service.ContainerCapacityService;
22 21 import com.huaheng.pc.config.location.domain.Location;
23 22 import com.huaheng.pc.config.location.service.LocationService;
24   -import com.huaheng.pc.config.sendMail.domain.SendMail;
25 23 import com.huaheng.pc.config.sendMail.service.MailService;
26 24 import com.huaheng.pc.config.sendMail.service.SendMailService;
27 25 import com.huaheng.pc.inventory.cycleCountDetail.domain.CycleCountDetail;
28 26 import com.huaheng.pc.inventory.cycleCountDetail.service.CycleCountDetailService;
29   -import com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader;
30 27 import com.huaheng.pc.inventory.cycleCountHeader.service.CycleCountHeaderService;
31 28 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
32 29 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
... ... @@ -55,29 +52,18 @@ import com.huaheng.pc.task.taskDetail.domain.TaskDetail;
55 52 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
56 53 import com.huaheng.pc.task.taskHeader.domain.MobileTask;
57 54 import com.huaheng.pc.task.taskHeader.domain.ShipmentTaskCreateModel;
58   -import javafx.concurrent.Task;
59   -import org.apache.poi.ss.formula.functions.T;
60   -import org.jsoup.helper.DataUtil;
  55 +import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
  56 +import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
61 57 import org.springframework.beans.factory.annotation.Autowired;
62 58 import org.springframework.stereotype.Service;
  59 +import org.springframework.transaction.annotation.Transactional;
  60 +
  61 +import javax.annotation.Resource;
63 62 import java.math.BigDecimal;
64   -import java.text.SimpleDateFormat;
65   -import java.time.temporal.TemporalAdjuster;
66   -import java.util.ArrayList;
67   -import java.util.Date;
68   -import java.util.List;
69   -import java.util.Map;
70 63 import java.util.*;
71 64 import java.util.concurrent.CopyOnWriteArrayList;
72 65 import java.util.stream.Collectors;
73 66  
74   -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
75   -import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
76   -import com.huaheng.pc.task.taskHeader.mapper.TaskHeaderMapper;
77   -import org.springframework.transaction.annotation.Transactional;
78   -
79   -import javax.annotation.Resource;
80   -
81 67 @Service
82 68 public class TaskHeaderServiceImpl extends ServiceImpl<TaskHeaderMapper, TaskHeader> implements TaskHeaderService {
83 69  
... ... @@ -289,7 +275,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
289 275 //删除主任务
290 276 taskHeaderService.removeById(taskHeader.getId());
291 277 // 更改库位状态（整盘入库任务除外）
292   - if (taskHeader.getInternalTaskType() == QuantityConstant.TASK_INTENERTYPE_SHELF) {
  278 + if (taskHeader.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_SHELF)) {
293 279 ReceiptContainerHeader record = new ReceiptContainerHeader();
294 280 record.setStatus((short) QuantityConstant.RECEIPT_CONTAINER_BUILD.intValue());
295 281 record.setId(taskHeader.getAllocationHeadId());
... ... @@ -299,7 +285,7 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
299 285 }
300 286 //根据任务类型来更新货箱状态
301 287 //修改关联的货箱状态
302   - if (taskHeader.getInternalTaskType() == QuantityConstant.TASK_INTENERTYPE_PICKING) {
  288 + if (taskHeader.getInternalTaskType().equals(QuantityConstant.TASK_INTENERTYPE_PICKING)) {
303 289 ShipmentContainerHeader shipmentContainerHeader = new ShipmentContainerHeader();
304 290 shipmentContainerHeader.setId(taskHeader.getAllocationHeadId());
305 291 shipmentContainerHeader.setStatus(QuantityConstant.SHIPMENT_CONTAINER_BUILD);
... ... @@ -1385,10 +1371,14 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1385 1371 public AjaxResult createReceiptTask(List<Integer> ids) {
1386 1372 for (Integer id : ids) {
1387 1373 ReceiptContainerHeader receiptContainerHeader = receiptContainerHeaderService.getById(id);
1388   - if (receiptContainerHeader == null)
  1374 + if (receiptContainerHeader == null) {
1389 1375 throw new ServiceException("任务不存在！");
1390   - if (!receiptContainerHeader.getWarehouseCode().equals(ShiroUtils.getWarehouseCode()))
  1376 + }
  1377 +
  1378 + if (!receiptContainerHeader.getWarehouseCode().equals(ShiroUtils.getWarehouseCode())) {
1391 1379 throw new ServiceException("任务不在当前仓库！");
  1380 + }
  1381 +
1392 1382  
1393 1383 //锁定容器
1394 1384 Container container = new Container();
... ... @@ -1402,8 +1392,9 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1402 1392 containerDetailLambda.eq(ReceiptContainerDetail::getReceiptContainerId, id);
1403 1393 List<ReceiptContainerDetail> list = receiptContainerDetailService.list(containerDetailLambda);
1404 1394  
1405   - if (list.size() < 1)
  1395 + if (list.size() < 1) {
1406 1396 throw new ServiceException("没有组盘明细，请先组盘！");
  1397 + }
1407 1398 if (receiptContainerHeader.getStatus() == QuantityConstant.RECEIPT_CONTAINER_BUILD.intValue()) {
1408 1399 if (receiptContainerHeader.getStatus().intValue() < QuantityConstant.RECEIPT_CONTAINER_TASK) {
1409 1400 receiptContainerHeader.setStatus((short) QuantityConstant.RECEIPT_CONTAINER_TASK.intValue());
... ... @@ -1469,10 +1460,12 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
1469 1460 throw new ServiceException("更新入库组盘明细状态出错");
1470 1461 }
1471 1462  
  1463 + /**
  1464 + * 修改明细状态为上架
  1465 + */
1472 1466 ReceiptDetail receiptDetail = receiptDetailService.getById(item.getReceiptDetailId());
1473   -
1474   - ReceiptDetail detail = receiptDetailService.queryflow(receiptDetail);
1475   - if (!receiptDetailService.updateById(detail)) {
  1467 + receiptDetail.setProcessStamp(String.valueOf(QuantityConstant.RECEIPT_HEADER_SHELF));
  1468 + if (!receiptDetailService.updateById(receiptDetail)) {
1476 1469 throw new ServiceException("更新入库单详情失败");
1477 1470 }
1478 1471 //更新头表状态
... ...
src/main/resources/application-dev.yml 0 → 100644
  View file @8cf81d8
  1 +# 数据源配置
  2 +spring:
  3 + datasource:
  4 + type: com.alibaba.druid.pool.DruidDataSource
  5 + driverClassName: com.mysql.cj.jdbc.Driver
  6 + druid:
  7 + # 主库
  8 + master:
  9 + url: jdbc:mysql://localhost:3306/xinyi_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
  10 + username: root
  11 + password: hhsoftware
  12 + # 从库
  13 + slave:
  14 + # 从库不启用
  15 + enabled: false
  16 + url:
  17 + username:
  18 + password:
  19 + # 初始连接数
  20 + initialSize: 5
  21 + # 最小连接池数量
  22 + minIdle: 10
  23 + # 最大连接池数量
  24 + maxActive: 20
  25 + # 配置获取连接等待超时的时间
  26 + maxWait: 5000
  27 + # \配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
  28 + timeBetweenEvictionRunsMillis: 60000
  29 + # 配置一个连接在池中最小生存的时间，单位是毫秒
  30 + minEvictableIdleTimeMillis: 30000
  31 + #配置一个连接在池中最大生存的时间，单位是毫秒
  32 + maxEvictableIdleTimeMillis: 300000
  33 + # 配置检测连接是否有效
  34 + validationQuery: SELECT 1 FROM DUAL
  35 + testWhileIdle: true
  36 + testOnBorrow: false
  37 + testOnReturn: false
  38 + webStatFilter:
  39 + enabled: true
  40 + statViewServlet:
  41 + enabled: true
  42 + # 设置白名单，不填则允许所有访问
  43 + allow:
  44 + url-pattern: /druid/*
  45 + # 控制台管理用户名和密码
  46 + login-username:
  47 + login-password:
  48 + filter:
  49 + stat:
  50 + enabled: true
  51 + # 慢SQL记录
  52 + log-slow-sql: true
  53 + slow-sql-millis: 1000
  54 + merge-sql: true
  55 + wall:
  56 + config:
  57 + multi-statement-allow: true
  58 +
  59 +#日志配置
  60 +logging:
  61 + level:
  62 + com.huaheng: debug
  63 + org.springframework: warn
  64 + spring.springboot.dao: DEBUG
  65 +
  66 +server:
  67 + port: 8800
  68 + servlet:
  69 + context-path: /wms/
0 70 \ No newline at end of file
... ...
src/main/resources/application-druid.properties
  View file @8cf81d8
... ... @@ -2,14 +2,14 @@
2 2 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
3 3 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
4 4 # \u4E3B\u5E93
5   -spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/xinyi_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
6   -#spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/huahengExample?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
  5 +#spring.datasource.druid.master.url=jdbc:mysql://172.16.29.45:3306/xinyi_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8
  6 +spring.datasource.druid.master.url=jdbc:mysql://39.100.243.49:3306/xinyi_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8&allowPublicKeyRetrieval=true
7 7 #spring.datasource.druid.master.url=jdbc:mysql://localhost:3306/wms2.0?characterEncoding=utf8&serverTimezone=GMT%2b8
8 8  
9   -spring.datasource.druid.master.username=root
10   -spring.datasource.druid.master.password=123456
11 9 #spring.datasource.druid.master.username=root
12   -#spring.datasource.druid.master.password=123456
  10 +#spring.datasource.druid.master.password=hhsoftware
  11 +spring.datasource.druid.master.username=user
  12 +spring.datasource.druid.master.password=R6c3#rYyQ@e%
13 13 # \u4ECE\u5E93
14 14 #spring.datasource.druid.slave.open = true
15 15 #spring.datasource.druid.slave.url=jdbc:mysql://172.16.29.45:3306/huaheng?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false
... ... @@ -22,7 +22,7 @@ spring.datasource.druid.max-active=100
22 22 # \u6700\u5C0F\u8FDE\u63A5\u6C60\u6570\u91CF
23 23 spring.datasource.druid.min-idle=10
24 24 # \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
25   -spring.datasource.druid.max-wait=60000
  25 +spring.datasource.druid.max-wait=5000
26 26 # \u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5\u4E0APSCache\u7684\u5927\u5C0F
27 27 spring.datasource.druid.pool-prepared-statements=true
28 28 spring.datasource.druid.max-pool-prepared-statement-per-connection-size=20
... ...
src/main/resources/application-prd.yml 0 → 100644
  View file @8cf81d8
  1 +# 数据源配置
  2 +spring:
  3 + datasource:
  4 + type: com.alibaba.druid.pool.DruidDataSource
  5 + driverClassName: com.mysql.cj.jdbc.Driver
  6 + druid:
  7 + # 主库
  8 + master:
  9 + url: jdbc:mysql://39.100.243.49:3306/xinyi_wms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2b8&allowPublicKeyRetrieval=true
  10 + username: user
  11 + password: R6c3#rYyQ@e%
  12 + # 从库
  13 + slave:
  14 + # 从库不启用
  15 + enabled: false
  16 + url:
  17 + username:
  18 + password:
  19 + # 初始连接数
  20 + initialSize: 5
  21 + # 最小连接池数量
  22 + minIdle: 10
  23 + # 最大连接池数量
  24 + maxActive: 20
  25 + # 配置获取连接等待超时的时间
  26 + maxWait: 5000
  27 + # \配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
  28 + timeBetweenEvictionRunsMillis: 60000
  29 + # 配置一个连接在池中最小生存的时间，单位是毫秒
  30 + minEvictableIdleTimeMillis: 30000
  31 + #配置一个连接在池中最大生存的时间，单位是毫秒
  32 + maxEvictableIdleTimeMillis: 300000
  33 + # 配置检测连接是否有效
  34 + validationQuery: SELECT 1 FROM DUAL
  35 + testWhileIdle: true
  36 + testOnBorrow: false
  37 + testOnReturn: false
  38 + webStatFilter:
  39 + enabled: true
  40 + statViewServlet:
  41 + enabled: true
  42 + # 设置白名单，不填则允许所有访问
  43 + allow:
  44 + url-pattern: /druid/*
  45 + # 控制台管理用户名和密码
  46 + login-username:
  47 + login-password:
  48 + filter:
  49 + stat:
  50 + enabled: true
  51 + # 慢SQL记录
  52 + log-slow-sql: true
  53 + slow-sql-millis: 1000
  54 + merge-sql: true
  55 + wall:
  56 + config:
  57 + multi-statement-allow: true
  58 +
  59 +#日志配置
  60 +logging:
  61 + level:
  62 + com.huaheng: debug
  63 + org.springframework: warn
  64 + spring.springboot.dao: DEBUG
  65 +
  66 +server:
  67 + port: 8888
  68 + servlet:
  69 + context-path: /wms/
0 70 \ No newline at end of file
... ...
src/main/resources/application.yml 0 → 100644
  View file @8cf81d8
  1 +spring:
  2 + profiles:
  3 + active: prd
  4 +---
  5 +#项目相关配置
  6 +#名称
  7 +huaheng:
  8 + name: huaheng
  9 + #版本
  10 + version: 4.0.0
  11 + #版权年份
  12 + copyrightYear: 2018
  13 + # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
  14 + profile: D:/ruoyi/uploadPath
  15 + # 获取ip地址开关
  16 + addressEnabled: false
  17 +
  18 +#测试服务端口、测试项目contextPath
  19 +server:
  20 + tomcat:
  21 + uri-encoding: UTF-8
  22 + # tomcat最大线程数，默认为200
  23 + max-threads: 800
  24 + # Tomcat启动初始化的线程数，默认值25
  25 + min-spare-threads: 30
  26 +
  27 +
  28 +# 用户配置
  29 +user:
  30 + password:
  31 + # 密码错误{maxRetryCount}次锁定10分钟
  32 + maxRetryCount: 5
  33 +
  34 +# Spring配置
  35 +spring:
  36 + http:
  37 + encoding:
  38 + charset: utf-8
  39 + enabled: true
  40 + force: true
  41 + # 模板引擎
  42 + thymeleaf:
  43 + mode: HTML
  44 + encoding: utf-8
  45 + # 禁用缓存
  46 + cache: false
  47 + #国际化资源文件路径
  48 + messages:
  49 + basename: i18n/messages
  50 + jackson:
  51 + time-zone: GMT+8
  52 + date-format: yyyy-MM-dd HH:mm:ss
  53 + property-naming-strategy: LOWER_CAMEL_CASE
  54 + # 文件上传
  55 + servlet:
  56 + multipart:
  57 + # 单个文件大小
  58 + max-file-size: 30MB
  59 + # 设置总上传的文件大小
  60 + max-request-size: 30MB
  61 + # 服务模块
  62 + devtools:
  63 + restart:
  64 + # 热部署开关
  65 + enabled: true
  66 + # 邮箱配置
  67 + mail:
  68 + # 邮箱服务器
  69 + host: smtp.qq.com
  70 + # 邮箱账号
  71 + username: 752432958@qq.com
  72 + # 邮箱密码
  73 + password: owobzjvlgsxrbdfe
  74 + # 编码类型
  75 + default-encoding: utf-8
  76 +
  77 +mybatis-plus:
  78 + mapper-locations: classpath:mybatis/**/*.xml
  79 + type-aliases-package: com.huaheng.pc.**.**.domain
  80 + global-config:
  81 + db-config:
  82 + logic-delete-value: 0 # 逻辑已删除值(默认为 1)
  83 + logic-not-delete-value: 1 # 逻辑未删除值(默认为 0)
  84 +
  85 +# PageHelper分页插件
  86 +pagehelper:
  87 + helperDialect: mysql
  88 + reasonable: true
  89 + supportMethodsArguments: true
  90 + params: count=countSql
  91 +
  92 +# Shiro
  93 +shiro:
  94 + user:
  95 + # 登录地址
  96 + loginUrl: /login
  97 + # 权限认证失败地址
  98 + unauthorizedUrl: /unauth
  99 + # 首页地址
  100 + indexUrl: /index
  101 + # 验证码开关
  102 + captchaEnabled: false
  103 + # 验证码类型 math 数组计算 char 字符
  104 + captchaType: math
  105 + cookie:
  106 + # 设置Cookie的域名 默认空，即当前访问的域名
  107 + domain:
  108 + # 设置cookie的有效访问路径
  109 + path: /
  110 + # 设置HttpOnly属性
  111 + httpOnly: true
  112 + # 设置Cookie的过期时间，天为单位
  113 + maxAge: 30
  114 + session:
  115 + # Session超时时间（默认30分钟）
  116 + expireTime: 30
  117 + # 同步session到数据库的周期（默认1分钟）
  118 + dbSyncPeriod: 1
  119 + # 相隔多久检查一次session的有效性，默认就是10分钟
  120 + validationInterval: 10
  121 +
  122 +# 防止XSS攻击
  123 +xss:
  124 + # 过滤开关
  125 + enabled: true
  126 + # 排除链接（多个用逗号分隔）
  127 + excludes: /system/notice/*
  128 + # 匹配链接
  129 + urlPatterns: /system/*,/monitor/*,/tool/*
  130 +
  131 + # 代码生成
  132 + # 作者
  133 +gen:
  134 + author: huaheng
  135 + # 默认生成包路径 module 需改成自己的模块名称 如 system monitor tool
  136 + packageName: com.huaheng.pc.task
  137 + # 自动去除表前缀，默认是true
  138 + autoRemovePre: false
  139 + # 表前缀(类名不会包含表前缀)
  140 + gen.tablePrefix: sys_
0 141 \ No newline at end of file
... ...
src/main/resources/fonts/STSONG.TTF 0 → 100644
View file @8cf81d8
No preview for this file type
src/main/resources/fonts/fonts.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<fontFamilies>
  3 + <fontFamily name="华文宋体">
  4 + <normal>fonts/STSONG.TTF</normal>
  5 + <bold>fonts/STSONG.TTF</bold>
  6 + <italic>fonts/STSONG.TTF</italic>
  7 + <boldItalic>fonts/STSONG.TTF</boldItalic>
  8 + <pdfEncoding>Identity-H</pdfEncoding>
  9 + <pdfEmbedded>true</pdfEmbedded>
  10 + <exportFonts>
  11 + <export key="net.sf.jasperreports.html">'华文宋体', Arial, Helvetica, sans-serif</export>
  12 + <export key="net.sf.jasperreports.xhtml">'华文宋体', Arial, Helvetica, sans-serif</export>
  13 + </exportFonts>
  14 + </fontFamily>
  15 +</fontFamilies>
... ...
src/main/resources/jaspers/mypage.jasper 0 → 100644
View file @8cf81d8
No preview for this file type
src/main/resources/mybatis/check/CheckDetailMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.check.checkDetail.mapper.CheckDetailMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.check.checkDetail.domain.CheckDetail">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="checkHeaderId" jdbcType="INTEGER" property="checkHeaderId" />
  8 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  9 + <result column="checkCode" jdbcType="VARCHAR" property="checkCode" />
  10 + <result column="inventoryDetailId" jdbcType="INTEGER" property="inventoryDetailId" />
  11 + <result column="locationCode" jdbcType="VARCHAR" property="locationCode" />
  12 + <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
  13 + <result column="receiptDetailId" jdbcType="INTEGER" property="receiptDetailId" />
  14 + <result column="receiptCode" jdbcType="VARCHAR" property="receiptCode" />
  15 + <result column="referCode" jdbcType="VARCHAR" property="referCode" />
  16 + <result column="referLineId" jdbcType="INTEGER" property="referLineId" />
  17 + <result column="referPlatform" jdbcType="VARCHAR" property="referPlatform" />
  18 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  19 + <result column="materialName" jdbcType="VARCHAR" property="materialName" />
  20 + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
  21 + <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
  22 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  23 + <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
  24 + <result column="status" jdbcType="VARCHAR" property="status" />
  25 + <result column="qty" jdbcType="INTEGER" property="qty" />
  26 + <result column="checkBy" jdbcType="VARCHAR" property="checkBy" />
  27 + <result column="checkAt" jdbcType="TIMESTAMP" property="checkAt" />
  28 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  29 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  30 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  31 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  32 + <result column="version" jdbcType="INTEGER" property="version" />
  33 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  34 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  35 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  36 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  37 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  38 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  39 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  40 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  41 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  42 + </resultMap>
  43 + <sql id="Base_Column_List">
  44 + <!--@mbg.generated-->
  45 + id, checkHeaderId, warehouseCode, checkCode, inventoryDetailId, locationCode, containerCode,
  46 + receiptDetailId, receiptCode, referCode, referLineId, referPlatform, materialCode,
  47 + materialName, materialSpec, materialUnit, companyCode, inventorySts, `status`, qty,
  48 + checkBy, checkAt, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1,
  49 + userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
  50 + </sql>
  51 +</mapper>
0 52 \ No newline at end of file
... ...
src/main/resources/mybatis/check/CheckHeaderMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.check.checkHeader.mapper.CheckHeaderMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.check.checkHeader.domain.CheckHeader">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
  8 + <result column="type" jdbcType="VARCHAR" property="type" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + <result column="referCode" jdbcType="VARCHAR" property="referCode" />
  11 + <result column="referPlatform" jdbcType="VARCHAR" property="referPlatform" />
  12 + <result column="enable" jdbcType="INTEGER" property="enable" />
  13 + <result column="status" jdbcType="VARCHAR" property="status" />
  14 + <result column="closedBy" jdbcType="VARCHAR" property="closedBy" />
  15 + <result column="closedAt" jdbcType="TIMESTAMP" property="closedAt" />
  16 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  17 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  18 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  19 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  20 + <result column="version" jdbcType="INTEGER" property="version" />
  21 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  22 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  23 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  24 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  25 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  26 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  27 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  28 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  29 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  30 + </resultMap>
  31 + <sql id="Base_Column_List">
  32 + <!--@mbg.generated-->
  33 + id, code, `type`, warehouseCode, referCode, referPlatform, `enable`, `status`, closedBy,
  34 + closedAt, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2,
  35 + userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
  36 + </sql>
  37 +
  38 + <select id="createCode" resultType="java.lang.String">
  39 + SELECT code FROM check_header WHERE substring(code,1,2) = #{checkType,jdbcType=VARCHAR} ORDER BY id DESC LIMIT 1
  40 + </select>
  41 +
  42 +</mapper>
0 43 \ No newline at end of file
... ...
src/main/resources/mybatis/check/CheckingRegisterMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.check.checkingRegister.mapper.CheckingRegisterMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.check.checkingRegister.domain.CheckingRegister">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="checkDetailId" jdbcType="INTEGER" property="checkDetailId" />
  8 + <result column="checkHeaderId" jdbcType="INTEGER" property="checkHeaderId" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + <result column="checkCode" jdbcType="VARCHAR" property="checkCode" />
  11 + <result column="receiptDetailId" jdbcType="INTEGER" property="receiptDetailId" />
  12 + <result column="receiptCode" jdbcType="VARCHAR" property="receiptCode" />
  13 + <result column="referCode" jdbcType="VARCHAR" property="referCode" />
  14 + <result column="referLineId" jdbcType="INTEGER" property="referLineId" />
  15 + <result column="referPlatform" jdbcType="VARCHAR" property="referPlatform" />
  16 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  17 + <result column="materialName" jdbcType="VARCHAR" property="materialName" />
  18 + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
  19 + <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
  20 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  21 + <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
  22 + <result column="qty" jdbcType="INTEGER" property="qty" />
  23 + <result column="checkBy" jdbcType="VARCHAR" property="checkBy" />
  24 + <result column="checkAt" jdbcType="TIMESTAMP" property="checkAt" />
  25 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  26 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  27 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  28 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  29 + <result column="version" jdbcType="INTEGER" property="version" />
  30 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  31 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  32 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  33 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  34 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  35 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  36 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  37 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  38 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  39 + </resultMap>
  40 + <sql id="Base_Column_List">
  41 + <!--@mbg.generated-->
  42 + id, checkDetailId, checkHeaderId, warehouseCode, checkCode, receiptDetailId, receiptCode,
  43 + referCode, referLineId, referPlatform, materialCode, materialName, materialSpec,
  44 + materialUnit, companyCode, inventorySts, qty, checkBy, checkAt, created, createdBy,
  45 + lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5,
  46 + userDef6, userDef7, userDef8, processStamp
  47 + </sql>
  48 +</mapper>
0 49 \ No newline at end of file
... ...
src/main/resources/mybatis/config/AlarmLevelMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.alarmLevel.mapper.AlarmLevelMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.alarmLevel.domain.AlarmLevel">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="type" jdbcType="INTEGER" property="type" />
  8 + <result column="level" jdbcType="INTEGER" property="level" />
  9 + <result column="timeThreshold" jdbcType="INTEGER" property="timeThreshold" />
  10 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  11 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  12 + <result column="lastUpdate" jdbcType="TIMESTAMP" property="lastUpdate" />
  13 + <result column="lastUpdateBy" jdbcType="VARCHAR" property="lastUpdateBy" />
  14 + <result column="enable" jdbcType="BIT" property="enable" />
  15 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  16 + </resultMap>
  17 + <sql id="Base_Column_List">
  18 + <!--@mbg.generated-->
  19 + id, `type`, `level`, timeThreshold, created, createdBy, lastUpdate, lastUpdateBy,
  20 + `enable`, userDef1
  21 + </sql>
  22 +</mapper>
0 23 \ No newline at end of file
... ...
src/main/resources/mybatis/config/BomHeaderMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.bom.mapper.BomHeaderMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.bom.domain.BomHeader">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  8 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  9 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  10 + <result column="materialName" jdbcType="VARCHAR" property="materialName" />
  11 + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
  12 + <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
  13 + <result column="qty" jdbcType="VARCHAR" property="qty" />
  14 + <result column="enable" jdbcType="INTEGER" property="enable" />
  15 + <result column="revisionNum" jdbcType="INTEGER" property="revisionNum" />
  16 + <result column="buildInstructions" jdbcType="VARCHAR" property="buildInstructions" />
  17 + <result column="buildLoc" jdbcType="VARCHAR" property="buildLoc" />
  18 + <result column="validFromDate" jdbcType="TIMESTAMP" property="validFromDate" />
  19 + <result column="validEndDate" jdbcType="TIMESTAMP" property="validEndDate" />
  20 + <result column="priority" jdbcType="INTEGER" property="priority" />
  21 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  22 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  23 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  24 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  25 + <result column="version" jdbcType="INTEGER" property="version" />
  26 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  27 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  28 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  29 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  30 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  31 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  32 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  33 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  34 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  35 + <result column="isVirtualBom" jdbcType="INTEGER" property="isVirtualBom" />
  36 + </resultMap>
  37 + <sql id="Base_Column_List">
  38 + <!--@mbg.generated-->
  39 + id, companyCode, warehouseCode, materialCode, materialName, materialSpec, materialUnit,
  40 + qty, `enable`, revisionNum, buildInstructions, buildLoc, validFromDate, validEndDate,
  41 + priority, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2,
  42 + userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp, isVirtualBom
  43 + </sql>
  44 +</mapper>
0 45 \ No newline at end of file
... ...
src/main/resources/mybatis/config/CarrierMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.carrier.mapper.CarrierMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.carrier.domain.Carrier">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
  8 + <result column="name" jdbcType="VARCHAR" property="name" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + <result column="waybillServerUrl" jdbcType="VARCHAR" property="waybillServerUrl" />
  11 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  12 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  13 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  14 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  15 + <result column="version" jdbcType="INTEGER" property="version" />
  16 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  17 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  18 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  19 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  20 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  21 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  22 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  23 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  24 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  25 + <result column="enable" jdbcType="INTEGER" property="enable" />
  26 + </resultMap>
  27 + <sql id="Base_Column_List">
  28 + <!--@mbg.generated-->
  29 + id, code, `name`, warehouseCode, waybillServerUrl, created, createdBy, lastUpdated,
  30 + lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6,
  31 + userDef7, userDef8, processStamp, `enable`
  32 + </sql>
  33 +</mapper>
0 34 \ No newline at end of file
... ...
src/main/resources/mybatis/config/ConfigValueMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.configValue.mapper.ConfigValueMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.configValue.domain.ConfigValue">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  8 + <result column="moduleType" jdbcType="VARCHAR" property="moduleType" />
  9 + <result column="recordType" jdbcType="VARCHAR" property="recordType" />
  10 + <result column="identifier" jdbcType="VARCHAR" property="identifier" />
  11 + <result column="value" jdbcType="VARCHAR" property="value" />
  12 + <result column="description" jdbcType="VARCHAR" property="description" />
  13 + <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />
  14 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  15 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  16 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  17 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  18 + <result column="version" jdbcType="INTEGER" property="version" />
  19 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  20 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  21 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  22 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  23 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  24 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  25 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  26 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  27 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  28 + </resultMap>
  29 + <sql id="Base_Column_List">
  30 + <!--@mbg.generated-->
  31 + id, warehouseCode, moduleType, recordType, identifier, `value`, description, systemCreated,
  32 + created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,
  33 + userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
  34 + </sql>
  35 +</mapper>
0 36 \ No newline at end of file
... ...
src/main/resources/mybatis/config/ConfigWarningMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.configWarning.mapper.ConfigWarningMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.configWarning.domain.ConfigWarning">
  5 + <!--@mbg.generated-->
  6 + <!--@Table config_warning-->
  7 + <id column="id" jdbcType="INTEGER" property="id" />
  8 + <id column="code" jdbcType="VARCHAR" property="code" />
  9 + <result column="type" jdbcType="VARCHAR" property="type" />
  10 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  11 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  12 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  13 + <result column="max" jdbcType="DECIMAL" property="max" />
  14 + <result column="min" jdbcType="DECIMAL" property="min" />
  15 + <result column="remark" jdbcType="VARCHAR" property="remark" />
  16 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  17 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  18 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  19 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  20 + </resultMap>
  21 + <sql id="Base_Column_List">
  22 + <!--@mbg.generated-->
  23 + id, code, `type`, warehouseCode, companyCode, materialCode, `max`, `min`, remark,
  24 + created, createdBy, lastUpdated, lastUpdatedBy
  25 + </sql>
  26 +</mapper>
0 27 \ No newline at end of file
... ...
src/main/resources/mybatis/config/ContainerCapacityMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.containerCapacity.mapper.ContainerCapacityMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.containerCapacity.domain.ContainerCapacity">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="containerType" jdbcType="VARCHAR" property="containerType" />
  8 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  9 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  10 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  11 + <result column="materialName" jdbcType="VARCHAR" property="materialName" />
  12 + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
  13 + <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
  14 + <result column="qty" jdbcType="DECIMAL" property="qty" />
  15 + <result column="enable" jdbcType="INTEGER" property="enable" />
  16 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  17 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  18 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  19 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  20 + <result column="version" jdbcType="INTEGER" property="version" />
  21 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  22 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  23 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  24 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  25 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  26 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  27 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  28 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  29 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  30 + </resultMap>
  31 + <sql id="Base_Column_List">
  32 + <!--@mbg.generated-->
  33 + id, containerType, warehouseCode, companyCode, materialCode, materialName, materialSpec,
  34 + materialUnit, qty, `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version,
  35 + userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
  36 + </sql>
  37 +</mapper>
0 38 \ No newline at end of file
... ...
src/main/resources/mybatis/config/ContainerMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.container.mapper.ContainerMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.container.domain.Container">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="name" jdbcType="VARCHAR" property="name" />
  8 + <result column="code" jdbcType="VARCHAR" property="code" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  11 + <result column="containerType" jdbcType="VARCHAR" property="containerType" />
  12 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  13 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  14 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  15 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  16 + <result column="status" jdbcType="VARCHAR" property="status" />
  17 + <result column="enable" jdbcType="INTEGER" property="enable" />
  18 + <result column="printNum" jdbcType="INTEGER" property="printNum" />
  19 + <result column="version" jdbcType="INTEGER" property="version" />
  20 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  21 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  22 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  23 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  24 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  25 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  26 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  27 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  28 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  29 + </resultMap>
  30 + <sql id="Base_Column_List">
  31 + <!--@mbg.generated-->
  32 + id, `name`, code, warehouseCode, companyCode, containerType, created, createdBy,
  33 + lastUpdated, lastUpdatedBy, `status`, `enable`, printNum, version, userDef1, userDef2,
  34 + userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
  35 + </sql>
  36 +
  37 + <select id="getEmptyContainerInLocation" resultType="com.huaheng.pc.config.location.domain.Location">
  38 + SELECT * FROM location t
  39 + <where>
  40 + t.zoneCode = 'L' AND t.warehouseCode = #{warehouseCode} AND t.status='empty' AND t.containerCode !='' AND t.containerCode is not NULL
  41 + AND t.`code` NOT in (SELECT b.locationCode FROM inventory_header b WHERE b.warehouseCode = #{warehouseCode} )
  42 + <if test="containerCode != null and containerCode !=''">
  43 + and t.containerCode = #{containerCode}
  44 + </if>
  45 + <if test="locationCode != null and locationCode !=''">
  46 + and t.`code` = #{locationCode}
  47 + </if>
  48 + </where>
  49 + </select>
  50 +
  51 + <update id="updateLocationCodeAndStatus">
  52 + UPDATE container set `status`=#{status}, locationCode=#{locationCode} WHERE warehouseCode=#{warehouseCode} AND `code`=#{containerCode}
  53 + </update>
  54 +
  55 + <select id="findAllByCode" resultMap="BaseResultMap" parameterType="java.lang.String">
  56 + SELECT * FROM container WHERE code = #{code,jdbcType=VARCHAR}
  57 + </select>
  58 +
  59 + <insert id="addList" parameterType="com.huaheng.pc.config.container.domain.Container" keyProperty="id" useGeneratedKeys="true" >
  60 + INSERT INTO container(
  61 + code,
  62 + warehouseCode,
  63 + companyCode,
  64 + containerType,
  65 + createdBy,
  66 + status,
  67 + enable
  68 + )values
  69 + <foreach collection="containers" item="item" index="index" separator=",">
  70 + (
  71 + #{item.code},
  72 + #{item.warehouseCode},
  73 + #{item.companyCode},
  74 + #{item.containerType},
  75 + #{item.createdBy},
  76 + #{item.status},
  77 + #{item.enable}
  78 + )
  79 + </foreach>
  80 + </insert>
  81 +</mapper>
0 82 \ No newline at end of file
... ...
src/main/resources/mybatis/config/CustomerMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.customer.mapper.CustomerMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.customer.domain.Customer">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
  8 + <result column="shipToCode" jdbcType="VARCHAR" property="shipToCode" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  11 + <result column="name" jdbcType="VARCHAR" property="name" />
  12 + <result column="address1" jdbcType="VARCHAR" property="address1" />
  13 + <result column="address2" jdbcType="VARCHAR" property="address2" />
  14 + <result column="city" jdbcType="VARCHAR" property="city" />
  15 + <result column="province" jdbcType="VARCHAR" property="province" />
  16 + <result column="country" jdbcType="VARCHAR" property="country" />
  17 + <result column="postalCode" jdbcType="VARCHAR" property="postalCode" />
  18 + <result column="parent" jdbcType="INTEGER" property="parent" />
  19 + <result column="attentionTo" jdbcType="VARCHAR" property="attentionTo" />
  20 + <result column="phoneNum" jdbcType="VARCHAR" property="phoneNum" />
  21 + <result column="mobile" jdbcType="VARCHAR" property="mobile" />
  22 + <result column="faxNum" jdbcType="VARCHAR" property="faxNum" />
  23 + <result column="email" jdbcType="VARCHAR" property="email" />
  24 + <result column="enable" jdbcType="INTEGER" property="enable" />
  25 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  26 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  27 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  28 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  29 + <result column="version" jdbcType="INTEGER" property="version" />
  30 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  31 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  32 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  33 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  34 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  35 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  36 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  37 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  38 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  39 + </resultMap>
  40 + <sql id="Base_Column_List">
  41 + <!--@mbg.generated-->
  42 + id, code, shipToCode, warehouseCode, companyCode, `name`, address1, address2, city,
  43 + province, country, postalCode, parent, attentionTo, phoneNum, mobile, faxNum, email,
  44 + `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2,
  45 + userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
  46 + </sql>
  47 +</mapper>
0 48 \ No newline at end of file
... ...
src/main/resources/mybatis/config/ExcelTemplateMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.excelTemplate.mapper.ExcelTemplateMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.excelTemplate.domain.ExcelTemplate">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  8 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  9 + <result column="name" jdbcType="VARCHAR" property="name" />
  10 + <result column="url" jdbcType="VARCHAR" property="url" />
  11 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  12 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  13 + <result column="lastUpdateBy" jdbcType="TIMESTAMP" property="lastUpdateBy" />
  14 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  15 + <result column="version" jdbcType="VARCHAR" property="version" />
  16 + <result column="enable" jdbcType="BIT" property="enable" />
  17 + </resultMap>
  18 + <sql id="Base_Column_List">
  19 + <!--@mbg.generated-->
  20 + id, warehouseCode, companyCode, `name`, url, created, createdBy, lastUpdateBy, lastUpdatedBy,
  21 + version, `enable`
  22 + </sql>
  23 +</mapper>
0 24 \ No newline at end of file
... ...
src/main/resources/mybatis/config/FilterConfigDetailMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.FilterConfigDetail.mapper.FilterConfigDetailMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.FilterConfigDetail.domain.FilterConfigDetail">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="headerId" jdbcType="INTEGER" property="headerId" />
  8 + <result column="code" jdbcType="VARCHAR" property="code" />
  9 + <result column="moduleType" jdbcType="VARCHAR" property="moduleType" />
  10 + <result column="recordType" jdbcType="VARCHAR" property="recordType" />
  11 + <result column="filterCode" jdbcType="VARCHAR" property="filterCode" />
  12 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  13 + <result column="description" jdbcType="VARCHAR" property="description" />
  14 + <result column="statement" jdbcType="LONGVARCHAR" property="statement" />
  15 + <result column="systemCreated" jdbcType="BIT" property="systemCreated" />
  16 + <result column="customSql" jdbcType="BIT" property="customSql" />
  17 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  18 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  19 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  20 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  21 + <result column="version" jdbcType="INTEGER" property="version" />
  22 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  23 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  24 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  25 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  26 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  27 + <result column="filterName" jdbcType="VARCHAR" property="filterName" />
  28 + </resultMap>
  29 + <sql id="Base_Column_List">
  30 + <!--@mbg.generated-->
  31 + id, headerId, code, moduleType, recordType, filterCode, warehouseCode, description,
  32 + `statement`, systemCreated, customSql, created, createdBy, lastUpdated, lastUpdatedBy,
  33 + version, userDef1, userDef2, userDef3, userDef4,
  34 + processStamp, filterName
  35 + </sql>
  36 +
  37 +
  38 + <insert id="filterConfigDetailCopy">
  39 + insert into filter_config_detail(headerId, code, moduleType, recordType, filterCode, warehouseCode, description,
  40 + `statement`,statements, systemCreated, customSql, createdBy, lastUpdatedBy,
  41 + version,processStamp, filterName)
  42 + select headerId, code, moduleType, recordType, filterCode, #{newCode}, description,
  43 + `statement`,statements, systemCreated, customSql,createdBy, lastUpdatedBy,version,
  44 + processStamp, filterName from filter_config_detail
  45 + where warehouseCode =#{code}
  46 +
  47 + </insert>
  48 +
  49 + <update id="updateHeaderId">
  50 + update filter_config_detail d
  51 + inner join filter_config_header t
  52 + on t.filterCode=d.filterCode and d.warehouseCode=t.warehouseCode and d.warehouseCode=#{code}
  53 + set d.headerId=t.id
  54 +
  55 + </update>
  56 +</mapper>
0 57 \ No newline at end of file
... ...
src/main/resources/mybatis/config/LocationMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.location.mapper.LocationMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.location.domain.Location">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
  8 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  9 + <result column="zoneCode" jdbcType="VARCHAR" property="zoneCode" />
  10 + <result column="locationType" jdbcType="VARCHAR" property="locationType" />
  11 + <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
  12 + <result column="iRow" jdbcType="INTEGER" property="iRow" />
  13 + <result column="iColumn" jdbcType="INTEGER" property="iColumn" />
  14 + <result column="iLayer" jdbcType="INTEGER" property="iLayer" />
  15 + <result column="iGrid" jdbcType="INTEGER" property="iGrid" />
  16 + <result column="roadway" jdbcType="VARCHAR" property="roadway" />
  17 + <result column="name" jdbcType="VARCHAR" property="name" />
  18 + <result column="lastCycleCountDate" jdbcType="TIMESTAMP" property="lastCycleCountDate" />
  19 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  20 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  21 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  22 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  23 + <result column="version" jdbcType="INTEGER" property="version" />
  24 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  25 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  26 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  27 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  28 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  29 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  30 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  31 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  32 + <result column="systemCreated" jdbcType="INTEGER" property="systemCreated" />
  33 + </resultMap>
  34 + <sql id="Base_Column_List">
  35 + <!--@mbg.generated-->
  36 + id, code, warehouseCode, zoneCode, locationType, containerCode, iRow, iColumn, iLayer,
  37 + iGrid, roadway, `name`, `enable`, lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy,
  38 + version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
  39 + systemCreated
  40 + </sql>
  41 +
  42 + <update id="updateStatus">
  43 + UPDATE location set `status`=#{status} WHERE warehouseCode=#{warehouseCode} AND `code`=#{code}
  44 + </update>
  45 + <select id="position" resultMap="BaseResultMap">
  46 + select code from location where #{locatingRule}
  47 + </select>
  48 +
  49 + <update id="updateContainerCodeAndStatus">
  50 + UPDATE location set `status`=#{status},containerCode=#{containerCode} WHERE warehouseCode=#{warehouseCode} AND `code`=#{locationCode}
  51 + </update>
  52 +
  53 + <insert id="addList" parameterType="com.huaheng.pc.config.location.domain.Location" keyProperty="id" useGeneratedKeys="true" >
  54 + INSERT INTO location(
  55 + code,
  56 + warehouseCode,
  57 + zoneCode,
  58 + locationType,
  59 + iRow,
  60 + iColumn,
  61 + iLayer,
  62 + iGrid,
  63 + roadway,
  64 + createdBy,
  65 + lastUpdatedBy,
  66 + status
  67 + )values
  68 + <foreach collection="locations" item="item" index="index" separator=",">
  69 + (
  70 + #{item.code},
  71 + #{item.warehouseCode},
  72 + #{item.zoneCode},
  73 + #{item.locationType},
  74 + #{item.iRow},
  75 + #{item.iColumn},
  76 + #{item.iLayer},
  77 + #{item.iGrid},
  78 + #{item.roadway},
  79 + #{item.createdBy},
  80 + #{item.lastUpdatedBy},
  81 + #{item.status}
  82 + )
  83 + </foreach>
  84 + </insert>
  85 +
  86 + <select id="getAllLocation" resultType="com.huaheng.pc.config.location.domain.Location">
  87 + select max(iRow) as iRow,max(iColumn) as iColumn,max(iLayer) as iLayer,max(iGrid) as iGrid from location l where l.warehouseCode=#{warehouseCode} AND l.locationType=#{type}
  88 + </select>
  89 +
  90 + <select id="getLocationProp" resultType="java.util.LinkedHashMap">
  91 + SELECT w.name warehouseName,ifnull(convert(a.num1/(b.num2+a.num1),decimal(15,2)),0) '有货',ifnull(convert(b.num2/(b.num2+a.num1),decimal(15,2)),0) '无货' from warehouse w
  92 + left join
  93 + (SELECT count(1) num1,warehouseCode FROM location WHERE containerCode!='' GROUP BY warehouseCode) a on a.warehouseCode=w.code
  94 + LEFT JOIN
  95 + (SELECT count(1) num2,warehouseCode FROM location WHERE containerCode ='' GROUP BY warehouseCode) b on b.warehouseCode=w.code
  96 + </select>
  97 +
  98 + <select id="pickLocation" resultType="com.huaheng.pc.config.location.domain.Location">
  99 + select * from location
  100 + where containerCode != '' and status = "empty"
  101 + </select>
  102 +</mapper>
0 103 \ No newline at end of file
... ...
src/main/resources/mybatis/config/MaterialMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.material.mapper.MaterialMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.material.domain.Material">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
  8 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + <result column="name" jdbcType="VARCHAR" property="name" />
  11 + <result column="spec" jdbcType="VARCHAR" property="spec" />
  12 + <result column="unit" jdbcType="VARCHAR" property="unit" />
  13 + <result column="type" jdbcType="VARCHAR" property="type" />
  14 + <result column="abcClass" jdbcType="VARCHAR" property="abcClass" />
  15 + <result column="daysToExpire" jdbcType="INTEGER" property="daysToExpire" />
  16 + <result column="locatingRule" jdbcType="VARCHAR" property="locatingRule" />
  17 + <result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" />
  18 + <result column="replenishmentRule" jdbcType="VARCHAR" property="replenishmentRule" />
  19 + <result column="emptyLocRule" jdbcType="VARCHAR" property="emptyLocRule" />
  20 + <result column="receivingFlow" jdbcType="VARCHAR" property="receivingFlow" />
  21 + <result column="shippingFlow" jdbcType="VARCHAR" property="shippingFlow" />
  22 + <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
  23 + <result column="trackSerialNum" jdbcType="INTEGER" property="trackSerialNum" />
  24 + <result column="autoGenSerialNum" jdbcType="INTEGER" property="autoGenSerialNum" />
  25 + <result column="autoGenSerialNumFormat" jdbcType="VARCHAR" property="autoGenSerialNumFormat" />
  26 + <result column="snTemplateCode" jdbcType="VARCHAR" property="snTemplateCode" />
  27 + <result column="expiringDays" jdbcType="INTEGER" property="expiringDays" />
  28 + <result column="minShelfLifeDays" jdbcType="INTEGER" property="minShelfLifeDays" />
  29 + <result column="enable" jdbcType="BIT" property="enable" />
  30 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  31 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  32 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  33 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  34 + <result column="version" jdbcType="INTEGER" property="version" />
  35 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  36 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  37 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  38 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  39 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  40 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  41 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  42 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  43 + </resultMap>
  44 + <sql id="Base_Column_List">
  45 + <!--@mbg.generated-->
  46 + id, code, companyCode, warehouseCode, `name`, spec, unit, `type`, abcClass, daysToExpire,
  47 + locatingRule, allocationRule, replenishmentRule, emptyLocRule, receivingFlow, shippingFlow,
  48 + attributeTemplateCode, trackSerialNum, autoGenSerialNum, autoGenSerialNumFormat,
  49 + snTemplateCode, expiringDays, minShelfLifeDays, `enable`, created, createdBy, lastUpdated,
  50 + lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6,
  51 + userDef7, userDef8
  52 + </sql>
  53 + <select id="findAllByCode" resultMap="BaseResultMap" parameterType="java.lang.String">
  54 + select * from material where code = #{code,jdbcType=VARCHAR}
  55 + </select>
  56 +
  57 + <select id="findLatest" resultMap="BaseResultMap" parameterType="java.lang.String">
  58 + select * from material order by id desc limit 10
  59 + </select>
  60 +</mapper>
0 61 \ No newline at end of file
... ...
src/main/resources/mybatis/config/MaterialMultipleMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.materialMultiple.mapper.MaterialMultipleMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.materialMultiple.domain.MaterialMultiple">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  8 + <result column="materialName" jdbcType="VARCHAR" property="materialName" />
  9 + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
  10 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  11 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  12 + <result column="unitId1" jdbcType="VARCHAR" property="unitId1" />
  13 + <result column="unitId2" jdbcType="VARCHAR" property="unitId2" />
  14 + <result column="multiple" jdbcType="DOUBLE" property="multiple" />
  15 + <result column="enable" jdbcType="INTEGER" property="enable" />
  16 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  17 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  18 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  19 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  20 + <result column="version" jdbcType="INTEGER" property="version" />
  21 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  22 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  23 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  24 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  25 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  26 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  27 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  28 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  29 + </resultMap>
  30 + <sql id="Base_Column_List">
  31 + <!--@mbg.generated-->
  32 + id, materialCode, materialName, materialSpec, companyCode, warehouseCode, unitId1,
  33 + unitId2, multiple, `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version,
  34 + userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8
  35 + </sql>
  36 +</mapper>
0 37 \ No newline at end of file
... ...
src/main/resources/mybatis/config/MaterialTypeMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.materialType.mapper.MaterialTypeMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.materialType.domain.MaterialType">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
  8 + <result column="name" jdbcType="VARCHAR" property="name" />
  9 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  10 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  11 + <result column="abcClass" jdbcType="VARCHAR" property="abcClass" />
  12 + <result column="daysToExpire" jdbcType="INTEGER" property="daysToExpire" />
  13 + <result column="receivingFlow" jdbcType="VARCHAR" property="receivingFlow" />
  14 + <result column="shippingFlow" jdbcType="VARCHAR" property="shippingFlow" />
  15 + <result column="locatingRule" jdbcType="VARCHAR" property="locatingRule" />
  16 + <result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" />
  17 + <result column="replenishmentRule" jdbcType="VARCHAR" property="replenishmentRule" />
  18 + <result column="emptyLocRule" jdbcType="VARCHAR" property="emptyLocRule" />
  19 + <result column="pickingRule" jdbcType="VARCHAR" property="pickingRule" />
  20 + <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
  21 + <result column="trackSerialNum" jdbcType="INTEGER" property="trackSerialNum" />
  22 + <result column="autoGenSerialNum" jdbcType="INTEGER" property="autoGenSerialNum" />
  23 + <result column="autoGenSerialNumFormat" jdbcType="VARCHAR" property="autoGenSerialNumFormat" />
  24 + <result column="snTemplateCode" jdbcType="VARCHAR" property="snTemplateCode" />
  25 + <result column="expiringDays" jdbcType="INTEGER" property="expiringDays" />
  26 + <result column="minShelfLifeDays" jdbcType="INTEGER" property="minShelfLifeDays" />
  27 + <result column="enable" jdbcType="INTEGER" property="enable" />
  28 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  29 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  30 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  31 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  32 + <result column="version" jdbcType="INTEGER" property="version" />
  33 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  34 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  35 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  36 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  37 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  38 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  39 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  40 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  41 + </resultMap>
  42 + <sql id="Base_Column_List">
  43 + <!--@mbg.generated-->
  44 + id, code, `name`, companyCode, warehouseCode, abcClass, daysToExpire, receivingFlow,
  45 + shippingFlow, locatingRule, allocationRule, replenishmentRule, emptyLocRule, pickingRule,
  46 + attributeTemplateCode, trackSerialNum, autoGenSerialNum, autoGenSerialNumFormat,
  47 + snTemplateCode, expiringDays, minShelfLifeDays, `enable`, created, createdBy, lastUpdated,
  48 + lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6,
  49 + userDef7, userDef8
  50 + </sql>
  51 +</mapper>
0 52 \ No newline at end of file
... ...
src/main/resources/mybatis/config/ReceiptPreferenceMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.receiptPreference.mapper.ReceiptPreferenceMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  8 + <result column="code" jdbcType="VARCHAR" property="code" />
  9 + <result column="name" jdbcType="VARCHAR" property="name" />
  10 + <result column="receivingFlow" jdbcType="VARCHAR" property="receivingFlow" />
  11 + <result column="autoAssignLPN" jdbcType="INTEGER" property="autoAssignLPN" />
  12 + <result column="allowOverReceiving" jdbcType="BIT" property="allowOverReceiving" />
  13 + <result column="allowOverReceivingQty" jdbcType="INTEGER" property="allowOverReceivingQty" />
  14 + <result column="autoLocate" jdbcType="INTEGER" property="autoLocate" />
  15 + <result column="showOpenQty" jdbcType="INTEGER" property="showOpenQty" />
  16 + <result column="groupPutaway" jdbcType="INTEGER" property="groupPutaway" />
  17 + <result column="manuallyBuildLPN" jdbcType="INTEGER" property="manuallyBuildLPN" />
  18 + <result column="locationRule" jdbcType="VARCHAR" property="locationRule" />
  19 + <result column="emptyLocRule" jdbcType="VARCHAR" property="emptyLocRule" />
  20 + <result column="checkinByPiece" jdbcType="INTEGER" property="checkinByPiece" />
  21 + <result column="pieceConfirm" jdbcType="INTEGER" property="pieceConfirm" />
  22 + <result column="abcClass" jdbcType="VARCHAR" property="abcClass" />
  23 + <result column="daysToExpire" jdbcType="INTEGER" property="daysToExpire" />
  24 + <result column="expiringDays" jdbcType="INTEGER" property="expiringDays" />
  25 + <result column="minShelfLifeDays" jdbcType="INTEGER" property="minShelfLifeDays" />
  26 + <result column="allowQuickPutaway" jdbcType="INTEGER" property="allowQuickPutaway" />
  27 + <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
  28 + <result column="useQuickCheckIn" jdbcType="INTEGER" property="useQuickCheckIn" />
  29 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  30 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  31 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  32 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  33 + <result column="version" jdbcType="INTEGER" property="version" />
  34 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  35 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  36 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  37 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  38 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  39 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  40 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  41 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  42 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  43 + </resultMap>
  44 + <sql id="Base_Column_List">
  45 + <!--@mbg.generated-->
  46 + id, warehouseCode, code, `name`, receivingFlow, autoAssignLPN, allowOverReceiving,
  47 + allowOverReceivingQty, autoLocate, showOpenQty, groupPutaway, manuallyBuildLPN, locationRule,
  48 + emptyLocRule, checkinByPiece, pieceConfirm, abcClass, daysToExpire, expiringDays,
  49 + minShelfLifeDays, allowQuickPutaway, attributeTemplateCode, useQuickCheckIn, created,
  50 + createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4,
  51 + userDef5, userDef6, userDef7, userDef8, processStamp
  52 + </sql>
  53 +</mapper>
0 54 \ No newline at end of file
... ...
src/main/resources/mybatis/config/ReceiptTypeMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.receiptType.mapper.ReceiptTypeMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.receiptType.domain.ReceiptType">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  8 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  9 + <result column="code" jdbcType="VARCHAR" property="code" />
  10 + <result column="name" jdbcType="VARCHAR" property="name" />
  11 + <result column="referType" jdbcType="VARCHAR" property="referType" />
  12 + <result column="receiptFlow" jdbcType="VARCHAR" property="receiptFlow" />
  13 + <result column="enable" jdbcType="BIT" property="enable" />
  14 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  15 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  16 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  17 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  18 + <result column="version" jdbcType="INTEGER" property="version" />
  19 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  20 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  21 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  22 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  23 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  24 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  25 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  26 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  27 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  28 + </resultMap>
  29 + <sql id="Base_Column_List">
  30 + <!--@mbg.generated-->
  31 + id, warehouseCode, companyCode, code, referType, receiptFlow, `enable`, created,
  32 + createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4,
  33 + userDef5, userDef6, userDef7, userDef8, processStamp
  34 + </sql>
  35 +</mapper>
0 36 \ No newline at end of file
... ...
src/main/resources/mybatis/config/SendMailMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.sendMail.mapper.SendMailMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.sendMail.domain.SendMail">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  8 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  9 + <result column="type" jdbcType="INTEGER" property="type" />
  10 + <result column="alarmId" jdbcType="INTEGER" property="alarmId" />
  11 + <result column="warningLevel" jdbcType="INTEGER" property="warningLevel" />
  12 + <result column="sendingLevel" jdbcType="INTEGER" property="sendingLevel" />
  13 + <result column="addressee" jdbcType="VARCHAR" property="addressee" />
  14 + <result column="email" jdbcType="VARCHAR" property="email" />
  15 + <result column="alarmTime" jdbcType="TIMESTAMP" property="alarmTime" />
  16 + <result column="title" jdbcType="VARCHAR" property="title" />
  17 + <result column="body" jdbcType="VARCHAR" property="body" />
  18 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  19 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  20 + <result column="enable" jdbcType="BIT" property="enable" />
  21 + <result column="handle" jdbcType="BIT" property="handle" />
  22 + <result column="deleted" jdbcType="BIT" property="deleted" />
  23 + <result column="code" jdbcType="VARCHAR" property="code" />
  24 + </resultMap>
  25 + <sql id="Base_Column_List">
  26 + <!--@mbg.generated-->
  27 + id, warehouseCode, companyCode, `type`, alarmId, warningLevel, sendingLevel, addressee,
  28 + email, alarmTime, title, body, created, lastUpdated, `enable`, handle, deleted, code
  29 + </sql>
  30 +</mapper>
0 31 \ No newline at end of file
... ...
src/main/resources/mybatis/config/StationMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.station.mapper.StationMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.station.domain.Station">
  5 + <!--@mbg.generated-->
  6 + <!--@Table station-->
  7 + <id column="id" jdbcType="INTEGER" property="id" />
  8 + <result column="code" jdbcType="VARCHAR" property="code" />
  9 + <result column="status" jdbcType="INTEGER" property="status" />
  10 + <result column="code" jdbcType="VARCHAR" property="code" />
  11 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  12 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  13 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  14 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  15 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  16 + </resultMap>
  17 + <sql id="Base_Column_List">
  18 + <!--@mbg.generated-->
  19 + id, code, `status`, type, warehouseCode, created, createdBy, lastUpdated, lastUpdatedBy
  20 + </sql>
  21 +</mapper>
0 22 \ No newline at end of file
... ...
src/main/resources/mybatis/config/StatusFlowDetailMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.statusFlow.mapper.StatusFlowDetailMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.statusFlow.domain.StatusFlowDetail">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="headerId" jdbcType="INTEGER" property="headerId" />
  8 + <result column="flowCode" jdbcType="VARCHAR" property="flowCode" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + <result column="moduleType" jdbcType="VARCHAR" property="moduleType" />
  11 + <result column="recordType" jdbcType="VARCHAR" property="recordType" />
  12 + <result column="enable" jdbcType="BIT" property="enable" />
  13 + <result column="sequence" jdbcType="INTEGER" property="sequence" />
  14 + <result column="nessary" jdbcType="INTEGER" property="nessary" />
  15 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  16 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  17 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  18 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  19 + <result column="version" jdbcType="INTEGER" property="version" />
  20 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  21 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  22 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  23 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  24 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  25 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  26 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  27 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  28 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  29 + </resultMap>
  30 + <sql id="Base_Column_List">
  31 + <!--@mbg.generated-->
  32 + id, headerId, flowCode, warehouseCode, moduleType, recordType, `enable`, `sequence`,
  33 + nessary, created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2,
  34 + userDef3, userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
  35 + </sql>
  36 +
  37 + <insert id="statusFlowDetailCopy">
  38 + insert into status_flow_detail(headerId,headerCode, flowCode, warehouseCode, moduleType, recordType, `enable`, `sequence`,
  39 + nessary, createdBy, lastUpdatedBy, version, processStamp)
  40 + select headerId,headerCode, flowCode, #{newCode}, moduleType, recordType, `enable`, `sequence`,
  41 + nessary, createdBy, lastUpdatedBy, version,processStamp from status_flow_detail
  42 + where warehouseCode =#{code}
  43 +
  44 + </insert>
  45 +
  46 + <update id="updateHeaderId">
  47 + update status_flow_detail d
  48 + inner join status_flow_header t
  49 + on t.code=d.headerCode and d.warehouseCode=t.warehouseCode and d.warehouseCode=#{code}
  50 + set d.headerId=t.id
  51 +
  52 + </update>
  53 +</mapper>
0 54 \ No newline at end of file
... ...
src/main/resources/mybatis/config/SupplierMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.supplier.mapper.SupplierMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.supplier.domain.Supplier">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="code" jdbcType="VARCHAR" property="code" />
  8 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  9 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  10 + <result column="name" jdbcType="VARCHAR" property="name" />
  11 + <result column="address1" jdbcType="VARCHAR" property="address1" />
  12 + <result column="address2" jdbcType="VARCHAR" property="address2" />
  13 + <result column="city" jdbcType="VARCHAR" property="city" />
  14 + <result column="state" jdbcType="VARCHAR" property="state" />
  15 + <result column="country" jdbcType="VARCHAR" property="country" />
  16 + <result column="postalCode" jdbcType="VARCHAR" property="postalCode" />
  17 + <result column="parent" jdbcType="INTEGER" property="parent" />
  18 + <result column="attentionTo" jdbcType="VARCHAR" property="attentionTo" />
  19 + <result column="phoneNum" jdbcType="VARCHAR" property="phoneNum" />
  20 + <result column="faxNum" jdbcType="VARCHAR" property="faxNum" />
  21 + <result column="email" jdbcType="VARCHAR" property="email" />
  22 + <result column="enable" jdbcType="BIT" property="enable" />
  23 + <result column="carrier" jdbcType="VARCHAR" property="carrier" />
  24 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  25 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  26 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  27 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  28 + <result column="version" jdbcType="INTEGER" property="version" />
  29 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  30 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  31 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  32 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  33 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  34 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  35 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  36 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  37 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  38 + <result column="deleted" jdbcType="BIT" property="deleted" />
  39 + </resultMap>
  40 + <sql id="Base_Column_List">
  41 + <!--@mbg.generated-->
  42 + id, code, warehouseCode, companyCode, `name`, address1, address2, city, `state`,
  43 + country, postalCode, parent, attentionTo, phoneNum, faxNum, email, `enable`, carrier,
  44 + created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,
  45 + userDef4, userDef5, userDef6, userDef7, userDef8, processStamp, deleted
  46 + </sql>
  47 +</mapper>
0 48 \ No newline at end of file
... ...
src/main/resources/mybatis/config/WarehouseMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.warehouse.mapper.WarehouseMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.warehouse.domain.Warehouse">
  5 + <!--@mbg.generated-->
  6 + <id column="code" jdbcType="VARCHAR" property="code" />
  7 + <result column="address1" jdbcType="VARCHAR" property="address1" />
  8 + <result column="address2" jdbcType="VARCHAR" property="address2" />
  9 + <result column="city" jdbcType="VARCHAR" property="city" />
  10 + <result column="state" jdbcType="VARCHAR" property="state" />
  11 + <result column="district" jdbcType="VARCHAR" property="district" />
  12 + <result column="country" jdbcType="VARCHAR" property="country" />
  13 + <result column="postalCode" jdbcType="VARCHAR" property="postalCode" />
  14 + <result column="attentionTo" jdbcType="VARCHAR" property="attentionTo" />
  15 + <result column="phoneNum" jdbcType="VARCHAR" property="phoneNum" />
  16 + <result column="faxNum" jdbcType="VARCHAR" property="faxNum" />
  17 + <result column="email" jdbcType="VARCHAR" property="email" />
  18 + <result column="hostCode" jdbcType="VARCHAR" property="hostCode" />
  19 + <result column="name" jdbcType="VARCHAR" property="name" />
  20 + <result column="enable" jdbcType="INTEGER" property="enable" />
  21 + <result column="orgCode" jdbcType="VARCHAR" property="orgCode" />
  22 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  23 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  24 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  25 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  26 + <result column="version" jdbcType="INTEGER" property="version" />
  27 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  28 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  29 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  30 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  31 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  32 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  33 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  34 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  35 + <result column="deleted" jdbcType="BIT" property="deleted" />
  36 + </resultMap>
  37 + <select id="wareHouseAll" resultType="com.huaheng.pc.system.user.domain.SysUserWarehouse">
  38 + select * from warehouse
  39 + </select>
  40 +
  41 + <select id="selectWarehouseByUserId"
  42 + resultType="com.huaheng.pc.config.warehouse.domain.Warehouse">
  43 + SELECT r.`name`, r.code
  44 + FROM sys_user u
  45 + LEFT JOIN sys_user_warehouse ur ON u.id = ur.userId
  46 + LEFT JOIN warehouse r ON ur.warehouseCode = r.code
  47 + WHERE ur.userId =#{userId}
  48 + </select>
  49 +
  50 + <select id="selectWarehouseAll"
  51 + resultType="com.huaheng.pc.config.warehouse.domain.Warehouse">
  52 + select * from warehouse
  53 + </select>
  54 +
  55 +
  56 +
  57 + <sql id="Base_Column_List">
  58 + <!--@mbg.generated-->
  59 + code, address1, address2, city, `state`, district, country, postalCode, attentionTo,
  60 + phoneNum, faxNum, email, hostCode, `name`, `enable`, orgCode, created, createdBy,
  61 + lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5,
  62 + userDef6, userDef7, userDef8, deleted
  63 + </sql>
  64 +
  65 + <insert id="companyCopy">
  66 + insert into warehouse_company(warehouseCode,companyId,companyCode)
  67 + select #{newWarehouseCode},companyId,companyCode from warehouse_company where warehouseCode=#{warehouseCode}
  68 + </insert>
  69 +
  70 + <select id="selectListEntityByEqual" resultType="com.huaheng.pc.config.warehouse.domain.Warehouse">
  71 + SELECT code, name, address1, address2, city, state, district, country, postalCode, attentionTo, phoneNum, faxNum,
  72 + email, hostCode,orgCode, created, createdBy, lastUpdated, lastUpdatedBy, enable, deleted, userDef1, userDef2, userDef3
  73 + FROM warehouse
  74 + <where>
  75 + <if test="code != null">
  76 + AND code = #{code}
  77 + </if>
  78 + <if test="name != null">
  79 + AND name = #{name}
  80 + </if>
  81 + <if test="address1 != null">
  82 + AND address1 = #{address1}
  83 + </if>
  84 + <if test="address2 != null">
  85 + AND address2 = #{address2}
  86 + </if>
  87 + <if test="city != null">
  88 + AND city = #{city}
  89 + </if>
  90 + <if test="state != null">
  91 + AND state = #{state}
  92 + </if>
  93 + <if test="district != null">
  94 + AND district = #{district}
  95 + </if>
  96 + <if test="country != null">
  97 + AND country = #{country}
  98 + </if>
  99 + <if test="postalCode != null">
  100 + AND postalCode = #{postalCode}
  101 + </if>
  102 + <if test="attentionTo != null">
  103 + AND attentionTo = #{attentionTo}
  104 + </if>
  105 + <if test="phoneNum != null">
  106 + AND phoneNum = #{phoneNum}
  107 + </if>
  108 + <if test="faxNum != null">
  109 + AND faxNum = #{faxNum}
  110 + </if>
  111 + <if test="email != null">
  112 + AND email = #{email}
  113 + </if>
  114 + <if test="hostCode != null">
  115 + AND hostCode = #{hostCode}
  116 + </if>
  117 + <if test="orgCode != null">
  118 + AND orgCode = #{orgCode}
  119 + </if>
  120 + <if test="created != null">
  121 + AND created = #{created}
  122 + </if>
  123 + <if test="createdBy != null">
  124 + AND createdBy = #{createdBy}
  125 + </if>
  126 + <if test="lastUpdated != null">
  127 + AND lastUpdated = #{lastUpdated}
  128 + </if>
  129 + <if test="lastUpdatedBy != null">
  130 + AND lastUpdatedBy = #{lastUpdatedBy}
  131 + </if>
  132 + <if test="enable != null">
  133 + AND enable = #{enable}
  134 + </if>
  135 + <if test="deleted != null">
  136 + AND deleted = #{deleted}
  137 + </if>
  138 + <if test="userDef1 != null">
  139 + AND userDef1 = #{userDef1}
  140 + </if>
  141 + <if test="userDef2 != null">
  142 + AND userDef2 = #{userDef2}
  143 + </if>
  144 + <if test="userDef3 != null">
  145 + AND userDef3 = #{userDef3}
  146 + </if>
  147 + </where>
  148 + </select>
  149 +
  150 +
  151 + <insert id="userCopy">
  152 + insert into sys_user_warehouse(userId,warehouseCode)
  153 + select userId,#{newWarehouseCode} from sys_user_warehouse where warehouseCode=#{warehouseCode}
  154 + </insert>
  155 +</mapper>
0 156 \ No newline at end of file
... ...
src/main/resources/mybatis/config/WaveFlowDetailMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.waveFlowDetail.mapper.WaveFlowDetailMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.waveFlowDetail.domain.WaveFlowDetail">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="headerId" jdbcType="INTEGER" property="headerId" />
  8 + <result column="waveFlowCode" jdbcType="VARCHAR" property="waveFlowCode" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + <result column="sequence" jdbcType="INTEGER" property="sequence" />
  11 + <result column="waveStepCode" jdbcType="VARCHAR" property="waveStepCode" />
  12 + <result column="waveStepName" jdbcType="VARCHAR" property="waveStepName" />
  13 + <result column="value1" jdbcType="VARCHAR" property="value1" />
  14 + <result column="value2" jdbcType="VARCHAR" property="value2" />
  15 + <result column="value3" jdbcType="VARCHAR" property="value3" />
  16 + <result column="value4" jdbcType="VARCHAR" property="value4" />
  17 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  18 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  19 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  20 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  21 + <result column="version" jdbcType="INTEGER" property="version" />
  22 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  23 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  24 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  25 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  26 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  27 + </resultMap>
  28 + <sql id="Base_Column_List">
  29 + <!--@mbg.generated-->
  30 + id, headerId, waveFlowCode, warehouseCode, `sequence`, waveStepCode, waveStepName,
  31 + value1, value2, value3, value4, created, createdBy, lastUpdated, lastUpdatedBy, version,
  32 + userDef1, userDef2, userDef3, userDef4, processStamp
  33 + </sql>
  34 +
  35 +
  36 + <insert id="waveFlowDetailCopy">
  37 + insert into wave_flow_detail(headerId, waveFlowCode, warehouseCode, `sequence`, waveStepCode, waveStepName,
  38 + value1, value2, value3, value4, createdBy, lastUpdatedBy, version,processStamp)
  39 + select headerId, waveFlowCode, #{newCode}, `sequence`, waveStepCode, waveStepName,
  40 + value1, value2, value3, value4, createdBy, lastUpdatedBy, version, processStamp from wave_flow_detail
  41 + where warehouseCode =#{code}
  42 +
  43 +
  44 + </insert>
  45 +
  46 + <update id="updateHeaderId">
  47 + update wave_flow_detail d
  48 + inner join wave_flow_header t
  49 + on t.code=d.waveFlowCode and d.warehouseCode=t.warehouseCode and d.warehouseCode=#{code}
  50 + set d.headerId=t.id
  51 +
  52 + </update>
  53 +
  54 +</mapper>
0 55 \ No newline at end of file
... ...
src/main/resources/mybatis/config/WcsscanbarcodeMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.config.wcsscanbarcode.mapper.WcsscanbarcodeMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.config.wcsscanbarcode.domain.Wcsscanbarcode">
  5 + <!--@mbg.generated-->
  6 + <!--@Table wcsscanbarcode-->
  7 + <id column="id" jdbcType="INTEGER" property="id" />
  8 + <result column="barcode" jdbcType="VARCHAR" property="barcode" />
  9 + <result column="flag" jdbcType="INTEGER" property="flag" />
  10 + <result column="area" jdbcType="INTEGER" property="area" />
  11 + <result column="Created" jdbcType="TIMESTAMP" property="created" />
  12 + <result column="CreatedBy" jdbcType="VARCHAR" property="createdby" />
  13 + <result column="Updated" jdbcType="TIMESTAMP" property="updated" />
  14 + <result column="UpdatedBy" jdbcType="VARCHAR" property="updatedby" />
  15 + <result column="content" jdbcType="VARCHAR" property="content" />
  16 + </resultMap>
  17 + <sql id="Base_Column_List">
  18 + <!--@mbg.generated-->
  19 + id, barcode, flag, area, Created, CreatedBy, Updated, UpdatedBy, content
  20 + </sql>
  21 +</mapper>
0 22 \ No newline at end of file
... ...
src/main/resources/mybatis/inventory/AdjustDetailMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.inventory.adjustDetail.mapper.AdjustDetailMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.inventory.adjustDetail.domain.AdjustDetail">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="adjustCode" jdbcType="VARCHAR" property="adjustCode" />
  8 + <result column="cycleCountCode" jdbcType="VARCHAR" property="cycleCountCode" />
  9 + <result column="inventoryDetailId" jdbcType="INTEGER" property="inventoryDetailId" />
  10 + <result column="cycleDetailId" jdbcType="INTEGER" property="cycleDetailId" />
  11 + <result column="checkCode" jdbcType="VARCHAR" property="checkCode" />
  12 + <result column="checkDetailId" jdbcType="VARCHAR" property="checkDetailId" />
  13 + <result column="referCode" jdbcType="VARCHAR" property="referCode" />
  14 + <result column="referDetailId" jdbcType="INTEGER" property="referDetailId" />
  15 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  16 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  17 + <result column="containerCode" jdbcType="VARCHAR" property="containerCode" />
  18 + <result column="locationCode" jdbcType="VARCHAR" property="locationCode" />
  19 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  20 + <result column="materialName" jdbcType="VARCHAR" property="materialName" />
  21 + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
  22 + <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
  23 + <result column="problemType" jdbcType="VARCHAR" property="problemType" />
  24 + <result column="attributeId" jdbcType="INTEGER" property="attributeId" />
  25 + <result column="fromInventorySts" jdbcType="VARCHAR" property="fromInventorySts" />
  26 + <result column="toInventorySts" jdbcType="VARCHAR" property="toInventorySts" />
  27 + <result column="fromQty" jdbcType="INTEGER" property="fromQty" />
  28 + <result column="toQty" jdbcType="INTEGER" property="toQty" />
  29 + <result column="gapQty" jdbcType="INTEGER" property="gapQty" />
  30 + <result column="status" jdbcType="INTEGER" property="status" />
  31 + <result column="supplierCode" jdbcType="VARCHAR" property="supplierCode" />
  32 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  33 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  34 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  35 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  36 + <result column="agreeBy" jdbcType="VARCHAR" property="agreeBy" />
  37 + <result column="agreeTime" jdbcType="TIMESTAMP" property="agreeTime" />
  38 + <result column="Remark" jdbcType="VARCHAR" property="remark" />
  39 + <result column="version" jdbcType="INTEGER" property="version" />
  40 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  41 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  42 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  43 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  44 + <result column="batch" jdbcType="VARCHAR" property="batch" />
  45 + <result column="lot" jdbcType="VARCHAR" property="lot" />
  46 + <result column="projectNo" jdbcType="VARCHAR" property="projectNo" />
  47 + <result column="weight" jdbcType="VARCHAR" property="weight" />
  48 + <result column="manufactureDate" jdbcType="TIMESTAMP" property="manufactureDate" />
  49 + <result column="expirationDate" jdbcType="TIMESTAMP" property="expirationDate" />
  50 +
  51 +
  52 +
  53 +
  54 +
  55 +
  56 +
  57 +
  58 + </resultMap>
  59 + <sql id="Base_Column_List">
  60 + <!--@mbg.generated-->
  61 + id, adjustCode, cycleCountCode, inventoryDetailId, cycleDetailId, checkCode, checkDetailId, referCode,
  62 + referDetailId, warehouseCode, companyCode, containerCode, locationCode ,materialCode, materialName,
  63 + materialSpec, materialUnit, problemType, attributeId, fromInventorySts, toInventorySts,
  64 + fromQty, toQty, gapQty, `status`,supplierCode, created, createdBy,lastUpdatedBy,lastUpdated, agreeTime, Remark,
  65 + version, userDef1, userDef2, userDef3, processStamp, batch, lot,projectNo,weight,manufactureDate,expirationDate
  66 + </sql>
  67 +</mapper>
0 68 \ No newline at end of file
... ...
src/main/resources/mybatis/inventory/CycleCountHeaderMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.inventory.cycleCountHeader.mapper.CycleCountHeaderMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.inventory.cycleCountHeader.domain.CycleCountHeader">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="countOrderId" jdbcType="INTEGER" property="countOrderId" />
  8 + <result column="round" jdbcType="INTEGER" property="round" />
  9 + <result column="masterCode" jdbcType="VARCHAR" property="code" />
  10 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  11 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  12 + <result column="countType" jdbcType="VARCHAR" property="countType" />
  13 + <result column="statusCyc" jdbcType="INTEGER" property="statusCyc" />
  14 + <result column="countAttribute" jdbcType="INTEGER" property="countAttribute" />
  15 + <result column="remark" jdbcType="VARCHAR" property="remark" />
  16 + <result column="totalLocs" jdbcType="INTEGER" property="totalLocs" />
  17 + <result column="totalItems" jdbcType="INTEGER" property="totalItems" />
  18 + <result column="zoneCode" jdbcType="VARCHAR" property="zoneCode" />
  19 + <result column="locationFilter" jdbcType="VARCHAR" property="locationFilter" />
  20 + <result column="releasedBy" jdbcType="VARCHAR" property="releasedBy" />
  21 + <result column="releasedAt" jdbcType="TIMESTAMP" property="releasedAt" />
  22 + <result column="closedBy" jdbcType="VARCHAR" property="closedBy" />
  23 + <result column="closedAt" jdbcType="TIMESTAMP" property="closedAt" />
  24 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  25 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  26 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  27 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  28 + <result column="version" jdbcType="INTEGER" property="version" />
  29 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  30 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  31 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  32 + <result column="verifyBy" jdbcType="VARCHAR" property="verifyBy" />
  33 + <result column="sourceCode" jdbcType="VARCHAR" property="sourceCode" />
  34 + <result column="uploadTime" jdbcType="TIMESTAMP" property="uploadTime" />
  35 + <result column="uploadStatus" jdbcType="BIT" property="uploadStatus" />
  36 + </resultMap>
  37 + <sql id="Base_Column_List">
  38 + <!--@mbg.generated-->
  39 + id, countOrderId, round, code, warehouseCode, companyCode, countType, statusCyc,
  40 + countAttribute, remark, totalLocs, totalItems, zoneCode, locationFilter, releasedBy,
  41 + releasedAt, closedBy, closedAt, created, createdBy, lastUpdated, lastUpdatedBy, version,
  42 + userDef1, userDef2, userDef3, verifyBy, sourceCode, uploadTime, uploadStatus
  43 + </sql>
  44 +
  45 + <select id="getLastCode" resultType="java.lang.String">
  46 + SELECT code FROM cycle_count_header ORDER BY id DESC LIMIT 1
  47 + </select>
  48 +
  49 +
  50 +
  51 +</mapper>
0 52 \ No newline at end of file
... ...
src/main/resources/mybatis/monitor/JobLogMapper.xml 0 → 100644
  View file @8cf81d8
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<!DOCTYPE mapper
  3 +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  4 +"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  5 +<mapper namespace="com.huaheng.pc.monitor.job.mapper.JobLogMapper">
  6 +
  7 + <resultMap type="com.huaheng.pc.monitor.job.domain.JobLog" id="JobLogResult">
  8 + <id property="id" column="id" />
  9 + <result property="jobName" column="jobName" />
  10 + <result property="jobGroup" column="jobGroup" />
  11 + <result property="methodName" column="methodName" />
  12 + <result property="methodParams" column="methodParams" />
  13 + <result property="jobMessage" column="jobMessage" />
  14 + <result property="status" column="status" />
  15 + <result property="exceptionInfo" column="exceptionInfo" />
  16 + <result property="createTime" column="createTime" />
  17 + </resultMap>
  18 +
  19 + <sql id="selectJobLogVo">
  20 + select id, jobName, jobGroup, methodName, methodParams, jobMessage, status, exceptionInfo, createTime from sys_job_log
  21 + </sql>
  22 +
  23 + <select id="selectJobLogList" parameterType="com.huaheng.pc.monitor.job.domain.JobLog" resultMap="JobLogResult">
  24 + <include refid="selectJobLogVo"/>
  25 + <where>
  26 + <if test="jobName != null and jobName != ''">
  27 + AND jobName like concat('%', #{jobName}, '%')
  28 + </if>
  29 + <if test="status != null and status != ''">
  30 + AND status = #{status}
  31 + </if>
  32 + <if test="methodName != null and methodName != ''">
  33 + AND methodName like concat('%', #{methodName}, '%')
  34 + </if>
  35 + <if test="params != null and params.beginTime != null"><!-- 开始时间检索 -->
  36 + and date_format(createTime,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
  37 + </if>
  38 + <if test="params != null and params.endTime != null"><!-- 结束时间检索 -->
  39 + and date_format(createTime,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
  40 + </if>
  41 + </where>
  42 + </select>
  43 +
  44 +
  45 + <select id="selectJobLogById" parameterType="Integer" resultMap="JobLogResult">
  46 + <include refid="selectJobLogVo"/>
  47 + where id = #{id}
  48 + </select>
  49 +
  50 + <delete id="deleteJobLogById" parameterType="Integer">
  51 + delete from sys_job_log where id = #{id}
  52 + </delete>
  53 +
  54 + <delete id="deleteJobLogByIds" parameterType="String">
  55 + delete from sys_job_log where id in
  56 + <foreach collection="array" item="id" open="(" separator="," close=")">
  57 + #{id}
  58 + </foreach>
  59 + </delete>
  60 +
  61 + <insert id="insertJobLog" parameterType="com.huaheng.pc.monitor.job.domain.JobLog">
  62 + insert into sys_job_log(
  63 + <if test="id != null and id != 0">id,</if>
  64 + <if test="jobName != null and jobName != ''">jobName,</if>
  65 + <if test="jobGroup != null and jobGroup != ''">jobGroup,</if>
  66 + <if test="methodName != null and methodName != ''">methodName,</if>
  67 + <if test="methodParams != null and methodParams != ''">methodParams,</if>
  68 + <if test="jobMessage != null and jobMessage != ''">jobMessage,</if>
  69 + <if test="status != null and status != ''">status,</if>
  70 + <if test="exceptionInfo != null and exceptionInfo != ''">exceptionInfo,</if>
  71 + createTime
  72 + )values(
  73 + <if test="id != null and id != 0">#{id},</if>
  74 + <if test="jobName != null and jobName != ''">#{jobName},</if>
  75 + <if test="jobGroup != null and jobGroup != ''">#{jobGroup},</if>
  76 + <if test="methodName != null and methodName != ''">#{methodName},</if>
  77 + <if test="methodParams != null and methodParams != ''">#{methodParams},</if>
  78 + <if test="jobMessage != null and jobMessage != ''">#{jobMessage},</if>
  79 + <if test="status != null and status != ''">#{status},</if>
  80 + <if test="exceptionInfo != null and exceptionInfo != ''">#{exceptionInfo},</if>
  81 + sysdate()
  82 + )
  83 + </insert>
  84 +
  85 + <update id="truncateTable" >
  86 + truncate table sys_job_log
  87 + </update>
  88 +
  89 +</mapper>
0 90 \ No newline at end of file
... ...