Browse Source

[feat] 物料研发总监审核清除var erpMaterial = [[${formData}]]; js赋值语句错误。

dev
zhangsiqi 4 months ago
parent
commit
f041ccd30b
  1. 2
      ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
  2. 3
      ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html
  3. 1
      ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html

2
ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java

@ -393,7 +393,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName()); warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName());
result = warehouseStorageOrderMapper.insertWarehouseStorageOrder(warehouseStorageOrder); result = warehouseStorageOrderMapper.insertWarehouseStorageOrder(warehouseStorageOrder);
} }
if(list2.size()>0) { if(list2.size() > 0) {
String warehouseStorageCode1 = redisCache.generateBillNo("RK"); String warehouseStorageCode1 = redisCache.generateBillNo("RK");
//入库部门类型:采购入库单 //入库部门类型:采购入库单
for (WarehouseStorageOrderDetail warehouseStorageOrderDetail: list2) { for (WarehouseStorageOrderDetail warehouseStorageOrderDetail: list2) {

3
ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html

@ -249,9 +249,6 @@
$("#form-edit").validate({focusCleanup: true}); $("#form-edit").validate({focusCleanup: true});
function submitHandler() { function submitHandler() {
if ($.validate.form()) { if ($.validate.form()) {
$("#selectMaterialType").removeAttr("disabled");
$("#selectProcessMethod").removeAttr("disabled");
$("#selectUnit").removeAttr("disabled");
var materialType = $('#selectMaterialType').select2('val'); var materialType = $('#selectMaterialType').select2('val');
$('#materialType').val(materialType); $('#materialType').val(materialType);
if ($('textarea[name="comment"]').val()) { if ($('textarea[name="comment"]').val()) {

1
ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html

@ -253,7 +253,6 @@
}, },
} }
}) })
var erpMaterial = [[${formData}]];
var prefix = ctx + "erp/material"; var prefix = ctx + "erp/material";
$("#form-edit").validate({focusCleanup: true}); $("#form-edit").validate({focusCleanup: true});
function submitHandler() { function submitHandler() {

Loading…
Cancel
Save