Browse Source

230703 委外加工单,采购对账

erp、
qianyu 1 year ago
parent
commit
4211cc79d4
  1. 55
      log.path_IS_UNDEFINED/sys-user.log
  2. 22
      ruoyi-admin/src/main/resources/templates/outsource/outsourceInspectionNotice/add.html
  3. 22
      ruoyi-admin/src/main/resources/templates/outsource/outsourceInspectionNotice/edit.html
  4. 49
      ruoyi-admin/src/main/resources/templates/purchase/purchaseAccountReconciliation/purchaseAccountReconciliation.html
  5. 6
      ruoyi-admin/src/main/resources/templates/system/productquotation/productquotation.html
  6. 62
      ruoyi-admin/target/classes/application-druid.yml
  7. 143
      ruoyi-admin/target/classes/application.yml
  8. 24
      ruoyi-admin/target/classes/banner.txt
  9. BIN
      ruoyi-admin/target/classes/com/ruoyi/ProviderPrice/controller/ProviderPricelistController.class
  10. BIN
      ruoyi-admin/target/classes/com/ruoyi/ProviderPrice/domain/ProviderPricelist.class
  11. BIN
      ruoyi-admin/target/classes/com/ruoyi/ProviderPrice/mapper/ProviderPricelistMapper.class
  12. BIN
      ruoyi-admin/target/classes/com/ruoyi/ProviderPrice/service/IProviderPricelistService.class
  13. BIN
      ruoyi-admin/target/classes/com/ruoyi/ProviderPrice/service/impl/ProviderPricelistServiceImpl.class
  14. BIN
      ruoyi-admin/target/classes/com/ruoyi/RuoYiApplication.class
  15. BIN
      ruoyi-admin/target/classes/com/ruoyi/RuoYiServletInitializer.class
  16. BIN
      ruoyi-admin/target/classes/com/ruoyi/buyorderHead/controller/BuyorderHeadController.class
  17. BIN
      ruoyi-admin/target/classes/com/ruoyi/buyorderHead/domain/BuyorderHead.class
  18. BIN
      ruoyi-admin/target/classes/com/ruoyi/buyorderHead/domain/ProcurementCheck.class
  19. BIN
      ruoyi-admin/target/classes/com/ruoyi/buyorderHead/mapper/BuyorderHeadMapper.class
  20. BIN
      ruoyi-admin/target/classes/com/ruoyi/buyorderHead/mapper/ProcurementCheckMapper.class
  21. BIN
      ruoyi-admin/target/classes/com/ruoyi/buyorderHead/service/IBuyorderHeadService.class
  22. BIN
      ruoyi-admin/target/classes/com/ruoyi/buyorderHead/service/ProcurementCheckService.class
  23. BIN
      ruoyi-admin/target/classes/com/ruoyi/buyorderHead/service/impl/BuyorderHeadServiceImpl.class
  24. BIN
      ruoyi-admin/target/classes/com/ruoyi/buyorderHead/service/impl/ProcurementCheckServiceImpl.class
  25. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/controller/BcpBomController.class
  26. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/controller/BomController.class
  27. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/controller/DataCollectController.class
  28. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/controller/ItemCPInfoController.class
  29. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/controller/ItemFLInfoController.class
  30. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/controller/ItemYLInfoController.class
  31. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/controller/PictureUploadController.class
  32. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/controller/ProviderController.class
  33. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/controller/WorkformHeadController.class
  34. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/domain/BcpBom.class
  35. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/domain/Bom.class
  36. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/domain/BoxWorkformHead.class
  37. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/domain/ItemInfo.class
  38. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/domain/PictureUpload.class
  39. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/domain/Provider.class
  40. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/domain/TagTemplate.class
  41. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/domain/UnitConvert.class
  42. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/domain/WorkformBoxProduct.class
  43. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/domain/WorkformHead.class
  44. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/mapper/BcpBomMapper.class
  45. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/mapper/BomMapper.class
  46. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/mapper/BoxWorkformHeadMapper.class
  47. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/mapper/ItemCPInfoMapper.class
  48. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/mapper/ItemFLInfoMapper.class
  49. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/mapper/ItemYLInfoMapper.class
  50. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/mapper/PictureUploadMapper.class
  51. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/mapper/ProviderMapper.class
  52. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/mapper/TagTemplateMapper.class
  53. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/mapper/WorkformBoxProductMapper.class
  54. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/mapper/WorkformHeadMapper.class
  55. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/IBcpBomService.class
  56. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/IBomService.class
  57. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/IBoxWorkformHeadService.class
  58. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/IItemCPInfoService.class
  59. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/IItemFLInfoService.class
  60. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/IItemYLInfoService.class
  61. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/IPictureUploadService.class
  62. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/IProviderService.class
  63. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/ITagTemplateService.class
  64. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/IWorkformBoxProductService.class
  65. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/IWorkformHeadService.class
  66. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/BcpBomServiceImpl.class
  67. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/BomServiceImpl.class
  68. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/BoxWorkformHeadServiceImpl.class
  69. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/ItemCPInfoServiceImpl.class
  70. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/ItemFLInfoServiceImpl.class
  71. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/ItemYLInfoServiceImpl.class
  72. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/PictureUploadServiceImpl.class
  73. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/ProviderServiceImpl.class
  74. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/TagTemplateServiceImpl.class
  75. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/WorkformBoxProductServiceImpl.class
  76. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/WorkformHeadServiceImpl.class
  77. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/utils/ApplicationRunnerImpl.class
  78. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/utils/Result.class
  79. BIN
      ruoyi-admin/target/classes/com/ruoyi/ck/utils/UnitConvertUtil.class
  80. BIN
      ruoyi-admin/target/classes/com/ruoyi/deliveryProgress/controller/DeliveryProgressInfoController.class
  81. BIN
      ruoyi-admin/target/classes/com/ruoyi/deliveryProgress/domain/DeliveryProgressInfo.class
  82. BIN
      ruoyi-admin/target/classes/com/ruoyi/deliveryProgress/mapper/DeliveryProgressInfoMapper.class
  83. BIN
      ruoyi-admin/target/classes/com/ruoyi/deliveryProgress/service/IDeliveryProgressInfoService.class
  84. BIN
      ruoyi-admin/target/classes/com/ruoyi/deliveryProgress/service/impl/DeliveryProgressInfoServiceImpl.class
  85. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/controller/CustomerController.class
  86. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/controller/ProductpriceController.class
  87. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/controller/SaleorderheadController.class
  88. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/controller/SaleorderlistController.class
  89. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/controller/SendcplistController.class
  90. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/controller/ViewSaleorderHLController.class
  91. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/domain/Customer.class
  92. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/domain/Parameter.class
  93. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/domain/Productprice.class
  94. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/domain/SaleorderHL.class
  95. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/domain/Saleorderhead.class
  96. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/domain/Saleorderlist.class
  97. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/domain/Sendcplist.class
  98. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/domain/ViewSaleorderHL.class
  99. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/domain/productpriceCAA.class
  100. BIN
      ruoyi-admin/target/classes/com/ruoyi/finance/mapper/CustomerMapper.class

55
log.path_IS_UNDEFINED/sys-user.log

@ -1,50 +1,5 @@
00:43:32.512 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== 11:47:36.657 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
00:43:32.513 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存==== 15:56:03.944 [schedule-pool-12] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
04:56:31.545 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功] 16:12:42.082 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
04:58:56.614 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务==== 16:12:42.088 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
04:58:56.615 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池==== 16:12:42.089 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
04:58:56.615 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
04:59:24.024 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
05:11:40.804 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
05:11:40.805 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
05:11:40.805 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
05:12:12.247 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
05:13:23.024 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
05:13:23.025 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
05:13:23.025 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
05:13:47.704 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
05:26:01.408 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
05:26:01.409 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
05:26:01.409 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
05:26:37.932 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
05:30:47.634 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
05:30:47.635 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
05:30:47.635 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
05:31:27.816 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
05:36:53.398 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
05:36:53.399 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
05:36:53.399 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
05:37:26.635 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
05:40:44.839 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
05:40:44.840 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
05:40:44.840 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
05:41:12.920 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
05:51:11.441 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
05:51:11.442 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
05:51:11.442 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
05:51:47.118 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
05:52:46.147 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
05:52:46.148 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
05:52:46.148 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
05:53:48.400 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
06:02:43.632 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
06:02:43.634 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
06:02:43.634 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
06:03:12.945 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
06:18:53.327 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
06:18:53.328 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
06:18:53.328 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====
06:19:21.279 [schedule-pool-2] INFO sys-user - [run,109] - [127.0.0.1]内网IP[admin][Success][登录成功]
06:35:17.463 [SpringContextShutdownHook] INFO sys-user - [shutdownSpringSessionValidationScheduler,45] - ====关闭会话验证任务====
06:35:17.464 [SpringContextShutdownHook] INFO sys-user - [shutdownAsyncManager,62] - ====关闭后台任务任务线程池====
06:35:17.464 [SpringContextShutdownHook] INFO sys-user - [shutdownEhCacheManager,75] - ====关闭缓存====

22
ruoyi-admin/src/main/resources/templates/outsource/outsourceInspectionNotice/add.html

@ -364,18 +364,7 @@
id: procedureData[i].procedureName, id: procedureData[i].procedureName,
text: procedureData[i].procedureName text: procedureData[i].procedureName
}; };
if ($("#form-outsourceInspectionNotice-add select[name='processingType']").find("option[value='" + processingTypeData.id + "']").length) {
$("#form-outsourceInspectionNotice-add select[name='processingType']").val(processingTypeData.id).trigger('change');
} else {
// Create a DOM Option and pre-select by default
var newOption = new Option(processingTypeData.text, processingTypeData.id, true, true); var newOption = new Option(processingTypeData.text, processingTypeData.id, true, true);
// Append it to the select
$("#form-outsourceInspectionNotice-add select[name='processingType']").append(newOption).trigger('change');
}
$("#form-outsourceInspectionNotice-add select[name='processingType']").select2({
tags: true
});
$("#form-outsourceInspectionNotice-add select[name='processingType']").val(null).trigger('change');
changeProcedureId = 0; changeProcedureId = 0;
} }
} }
@ -392,18 +381,7 @@
id: procedureName, id: procedureName,
text: procedureName text: procedureName
}; };
if ($("#form-outsourceInspectionNotice-add select[name='processingType']").find("option[value='" + processingTypeData.id + "']").length) {
$("#form-outsourceInspectionNotice-add select[name='processingType']").val(processingTypeData.id).trigger('change');
} else {
// Create a DOM Option and pre-select by default
var newOption = new Option(processingTypeData.text, processingTypeData.id, true, true); var newOption = new Option(processingTypeData.text, processingTypeData.id, true, true);
// Append it to the select
$("#form-outsourceInspectionNotice-add select[name='processingType']").append(newOption).trigger('change');
}
$("#form-outsourceInspectionNotice-add select[name='processingType']").select2({
tags: true
});
$("#form-outsourceInspectionNotice-add select[name='processingType']").val(null).trigger('change');
changeProcedureId = 0; changeProcedureId = 0;
} }
} }

22
ruoyi-admin/src/main/resources/templates/outsource/outsourceInspectionNotice/edit.html

@ -343,18 +343,7 @@
id: procedureData[i].procedureName, id: procedureData[i].procedureName,
text: procedureData[i].procedureName text: procedureData[i].procedureName
}; };
if ($("#form-outsourceInspectionNotice-edit select[name='processingType']").find("option[value='" + processingTypeData.id + "']").length) {
$("#form-outsourceInspectionNotice-edit select[name='processingType']").val(processingTypeData.id).trigger('change');
} else {
// Create a DOM Option and pre-select by default
var newOption = new Option(processingTypeData.text, processingTypeData.id, true, true); var newOption = new Option(processingTypeData.text, processingTypeData.id, true, true);
// Append it to the select
$("#form-outsourceInspectionNotice-edit select[name='processingType']").append(newOption).trigger('change');
}
$("#form-outsourceInspectionNotice-edit select[name='processingType']").select2({
tags: true
});
$("#form-outsourceInspectionNotice-edit select[name='processingType']").val(null).trigger('change');
changeProcedureId = 0; changeProcedureId = 0;
} }
} }
@ -371,18 +360,7 @@
id: procedureName, id: procedureName,
text: procedureName text: procedureName
}; };
if ($("#form-outsourceInspectionNotice-edit select[name='processingType']").find("option[value='" + processingTypeData.id + "']").length) {
$("#form-outsourceInspectionNotice-edit select[name='processingType']").val(processingTypeData.id).trigger('change');
} else {
// Create a DOM Option and pre-select by default
var newOption = new Option(processingTypeData.text, processingTypeData.id, true, true); var newOption = new Option(processingTypeData.text, processingTypeData.id, true, true);
// Append it to the select
$("#form-outsourceInspectionNotice-edit select[name='processingType']").append(newOption).trigger('change');
}
$("#form-outsourceInspectionNotice-edit select[name='processingType']").select2({
tags: true
});
$("#form-outsourceInspectionNotice-edit select[name='processingType']").val(null).trigger('change');
changeProcedureId = 0; changeProcedureId = 0;
} }
} }

49
ruoyi-admin/src/main/resources/templates/purchase/purchaseAccountReconciliation/purchaseAccountReconciliation.html

@ -6,6 +6,13 @@
<link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet"> <link th:href="@{/ajax/libs/select2/select2.css}" rel="stylesheet">
<link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet"> <link th:href="@{/ajax/libs/select2/select2-bootstrap.css}" rel="stylesheet">
<script type="text/javascript" th:src="@{/js/axios.min.js}"></script> <script type="text/javascript" th:src="@{/js/axios.min.js}"></script>
<style>
.table>tfoot>tr>th {
border: 0px solid #ddd;
font-weight: 400;
font-size: 13px;
}
</style>
</head> </head>
<body class="gray-bg"> <body class="gray-bg">
<div class="container-div"> <div class="container-div">
@ -26,10 +33,6 @@
<span>-</span> <span>-</span>
<input type="text" class="time-input" id="endDeliveryTime" placeholder="结束时间" name="params[endDeliveryTime]"/> <input type="text" class="time-input" id="endDeliveryTime" placeholder="结束时间" name="params[endDeliveryTime]"/>
</li> </li>
<li>
<label>订购单号:</label>
<input type="text" name="purchaseOrderNumber"/>
</li>
<li> <li>
<label>供应商代码:</label> <label>供应商代码:</label>
<!-- <input type="text" name="supplierCode"/>--> <!-- <input type="text" name="supplierCode"/>-->
@ -74,10 +77,6 @@
<option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option> <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
</select> </select>
</li> </li>
<li>
<label>入库单号:</label>
<input type="text" name="warehousingNumber"/>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@ -190,6 +189,7 @@
pageList: [10, 25, "all"], pageList: [10, 25, "all"],
clickToSelect: true, clickToSelect: true,
modalName: "采购对账", modalName: "采购对账",
showFooter:true,//页脚
columns: [{ columns: [{
checkbox: true checkbox: true
}, },
@ -205,15 +205,34 @@
actions.push('<a class="btn btn-danger btn-xs disabled">未对账</a> '); actions.push('<a class="btn btn-danger btn-xs disabled">未对账</a> ');
} }
return actions.join(''); return actions.join('');
},
footerFormatter: function (value) {
return "合计";
} }
}, },
{ {
field: 'warehousingNumber', field: 'warehousingNumber',
title: '入库单号' title: '入库单号',
footerFormatter: function (value) {
var count = 0;
for (var i in value) {
count+= parseFloat(value[i].warehousingQuantity);
}
console.log(count)
return "入库数量:"+count.toFixed(2);
}
}, },
{ {
field: 'purchaseOrderNumber', field: 'purchaseOrderNumber',
title: '订购单号' title: '订购单号',
footerFormatter: function (value) {
var count = 0;
for (var i in value) {
count+= parseFloat(value[i].amountMoney);
}
console.log(count)
return "金额:"+count.toFixed(2);
}
}, },
{ {
field: 'warehousingDate', field: 'warehousingDate',
@ -285,7 +304,15 @@
{ {
field: 'accountReconciliationTime', field: 'accountReconciliationTime',
title: '对账时间' title: '对账时间'
}] }],
onPostBody: function () {
//合并页脚
var footer_tbody = $('.fixed-table-footer table tbody');
var footer_tr = footer_tbody.find('>tr');
var footer_td = footer_tr.find('>td');
}
}; };
$.table.init(options); $.table.init(options);
}); });

6
ruoyi-admin/src/main/resources/templates/system/productquotation/productquotation.html

@ -64,9 +64,11 @@
<input type="text" name="enterpriseName"/> <input type="text" name="enterpriseName"/>
</li> </li>
<li> <li class="select-time">
<label>订价日期:</label> <label>订价日期:</label>
<input type="text" class="time-input" placeholder="请选择订价日期" name="pricingDate"/> <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
<span>-</span>
<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
</li> </li>
<li> <li>
<label>是否为当前报价:</label> <label>是否为当前报价:</label>

62
ruoyi-admin/target/classes/application-druid.yml

@ -1,62 +0,0 @@
# 数据源配置
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
druid:
# 主库数据源
master:
# url: jdbc:mysql://47.100.92.253:3306/smarterp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
# username: root
# password: RuiYi123
url: jdbc:mysql://39.104.169.14:3306/smarterp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: root
password: RuiYi2022
# username: root
# password: RuiYi2022
# 从库数据源
slave:
# 从数据源开关/默认关闭
enabled: false
url:
username:
password:
# 初始连接数
initialSize: 5
# 最小连接池数量
minIdle: 10
# 最大连接池数量
maxActive: 20
# 配置获取连接等待超时的时间
maxWait: 60000
# 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
timeBetweenEvictionRunsMillis: 60000
# 配置一个连接在池中最小生存的时间,单位是毫秒
minEvictableIdleTimeMillis: 300000
# 配置一个连接在池中最大生存的时间,单位是毫秒
maxEvictableIdleTimeMillis: 900000
# 配置检测连接是否有效
validationQuery: SELECT 1 FROM DUAL
testWhileIdle: true
testOnBorrow: false
testOnReturn: false
webStatFilter:
enabled: true
statViewServlet:
enabled: true
# 设置白名单,不填则允许所有访问
allow:
url-pattern: /druid/*
# 控制台管理用户名和密码
login-username: ruoyi
login-password: 123456
filter:
stat:
enabled: true
# 慢SQL记录
log-slow-sql: true
slow-sql-millis: 1000
merge-sql: true
wall:
config:
multi-statement-allow: true

143
ruoyi-admin/target/classes/application.yml

@ -1,143 +0,0 @@
# 项目相关配置
ruoyi:
# 名称
name: RuoYi
# 版本
version: 4.6.1
# 版权年份
copyrightYear: 2021
# 实例演示开关
demoEnabled: false
# 文件路径 示例( Windows配置c:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath)
profile: C:/ruoyi/uploadPath
# 获取ip地址开关
addressEnabled: false
# 开发环境配置
server:
# 服务器的HTTP端口,默认为80
port: 8082
servlet:
# 应用的访问路径
context-path: /
tomcat:
# tomcat的URI编码
uri-encoding: UTF-8
# tomcat最大线程数,默认为200
max-threads: 801
# Tomcat启动初始化的线程数,默认值25
min-spare-threads: 30
# 日志配置
logging:
level:
com.ruoyi: debug
org.springframework: warn
# 用户配置
user:
password:
# 密码错误{maxRetryCount}次锁定10分钟
maxRetryCount: 5
# Spring配置
spring:
# 模板引擎
thymeleaf:
mode: HTML
encoding: utf-8
# 禁用缓存
cache: false
# 资源信息
messages:
# 国际化资源文件路径
basename: static/i18n/messages
jackson:
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
profiles:
active: druid
# 文件上传
servlet:
multipart:
# 单个文件大小
max-file-size: 10MB
# 设置总上传的文件大小
max-request-size: 20MB
# 服务模块
devtools:
restart:
# 热部署开关
enabled: true
activiti:
check-process-definitions: false
# 检测身份信息表是否存在
db-identity-used: false
# MyBatis
mybatis:
# 搜索指定包别名
typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.**.domain
# 配置mapper的扫描,找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml
# PageHelper分页插件
pagehelper:
helperDialect: mysql
reasonable: true
supportMethodsArguments: true
params: count=countSql
# Shiro
shiro:
user:
# 登录地址
loginUrl: /login
# 权限认证失败地址
unauthorizedUrl: /unauth
# 首页地址
indexUrl: /index
# 验证码开关
captchaEnabled: true
# 验证码类型 math 数组计算 char 字符
captchaType: math
cookie:
# 设置Cookie的域名 默认空,即当前访问的域名
domain:
# 设置cookie的有效访问路径
path: /
# 设置HttpOnly属性
httpOnly: true
# 设置Cookie的过期时间,天为单位
maxAge: 30
session:
# Session超时时间,-1代表永不过期(默认30分钟)
expireTime: 30
# 同步session到数据库的周期(默认1分钟)
dbSyncPeriod: 1
# 相隔多久检查一次session的有效性,默认就是10分钟
validationInterval: 10
# 同一个用户最大会话数,比如2的意思是同一个账号允许最多同时两个人登录(默认-1不限制)
maxSession: -1
# 踢出之前登录的/之后登录的用户,默认踢出之前登录的用户
kickoutAfter: false
# 防止XSS攻击
xss:
# 过滤开关
enabled: true
# 排除链接(多个用逗号分隔)
excludes: /system/notice/*
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*
# Swagger配置
swagger:
# 是否开启swagger
enabled: true

24
ruoyi-admin/target/classes/banner.txt

@ -1,24 +0,0 @@
Application Version: ${ruoyi.version}
Spring Boot Version: ${spring-boot.version}
////////////////////////////////////////////////////////////////////
// _ooOoo_ //
// o8888888o //
// 88" . "88 //
// (| ^_^ |) //
// O\ = /O //
// ____/`---'\____ //
// .' \\| |// `. //
// / \\||| : |||// \ //
// / _||||| -:- |||||- \ //
// | | \\\ - /// | | //
// | \_| ''\---/'' | | //
// \ .-\__ `-` ___/-. / //
// ___`. .' /--.--\ `. . ___ //
// ."" '< `.___\_<|>_/___.' >'"". //
// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
// \ \ `-. \_ __\ /__ _/ .-` / / //
// ========`-.____`-.___\_____/___.-`____.-'======== //
// `=---=' //
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
// 佛祖保佑 永不宕机 永无BUG //
////////////////////////////////////////////////////////////////////

BIN
ruoyi-admin/target/classes/com/ruoyi/ProviderPrice/controller/ProviderPricelistController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ProviderPrice/domain/ProviderPricelist.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ProviderPrice/mapper/ProviderPricelistMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ProviderPrice/service/IProviderPricelistService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ProviderPrice/service/impl/ProviderPricelistServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/RuoYiApplication.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/RuoYiServletInitializer.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/buyorderHead/controller/BuyorderHeadController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/buyorderHead/domain/BuyorderHead.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/buyorderHead/domain/ProcurementCheck.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/buyorderHead/mapper/BuyorderHeadMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/buyorderHead/mapper/ProcurementCheckMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/buyorderHead/service/IBuyorderHeadService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/buyorderHead/service/ProcurementCheckService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/buyorderHead/service/impl/BuyorderHeadServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/buyorderHead/service/impl/ProcurementCheckServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/controller/BcpBomController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/controller/BomController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/controller/DataCollectController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/controller/ItemCPInfoController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/controller/ItemFLInfoController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/controller/ItemYLInfoController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/controller/PictureUploadController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/controller/ProviderController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/controller/WorkformHeadController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/domain/BcpBom.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/domain/Bom.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/domain/BoxWorkformHead.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/domain/ItemInfo.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/domain/PictureUpload.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/domain/Provider.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/domain/TagTemplate.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/domain/UnitConvert.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/domain/WorkformBoxProduct.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/domain/WorkformHead.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/mapper/BcpBomMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/mapper/BomMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/mapper/BoxWorkformHeadMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/mapper/ItemCPInfoMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/mapper/ItemFLInfoMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/mapper/ItemYLInfoMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/mapper/PictureUploadMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/mapper/ProviderMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/mapper/TagTemplateMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/mapper/WorkformBoxProductMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/mapper/WorkformHeadMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/IBcpBomService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/IBomService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/IBoxWorkformHeadService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/IItemCPInfoService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/IItemFLInfoService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/IItemYLInfoService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/IPictureUploadService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/IProviderService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/ITagTemplateService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/IWorkformBoxProductService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/IWorkformHeadService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/BcpBomServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/BomServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/BoxWorkformHeadServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/ItemCPInfoServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/ItemFLInfoServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/ItemYLInfoServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/PictureUploadServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/ProviderServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/TagTemplateServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/WorkformBoxProductServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/service/impl/WorkformHeadServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/utils/ApplicationRunnerImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/utils/Result.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/ck/utils/UnitConvertUtil.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/deliveryProgress/controller/DeliveryProgressInfoController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/deliveryProgress/domain/DeliveryProgressInfo.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/deliveryProgress/mapper/DeliveryProgressInfoMapper.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/deliveryProgress/service/IDeliveryProgressInfoService.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/deliveryProgress/service/impl/DeliveryProgressInfoServiceImpl.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/controller/CustomerController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/controller/ProductpriceController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/controller/SaleorderheadController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/controller/SaleorderlistController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/controller/SendcplistController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/controller/ViewSaleorderHLController.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/domain/Customer.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/domain/Parameter.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/domain/Productprice.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/domain/SaleorderHL.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/domain/Saleorderhead.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/domain/Saleorderlist.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/domain/Sendcplist.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/domain/ViewSaleorderHL.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/domain/productpriceCAA.class

Binary file not shown.

BIN
ruoyi-admin/target/classes/com/ruoyi/finance/mapper/CustomerMapper.class

Binary file not shown.

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save