root
/
smart-erp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: root:e2b65df8fa88a5970a256bd22311b94c6b4cd177
Branches Tags
root:dev
root:erp、
root:gsw
root:yjc_local
...
compare: root:fe5e744240484556b07a2e550a084bb926522718
Branches Tags
root:dev
root:erp、
root:gsw
root:yjc_local

4 Commits
e2b65df8fa ... fe5e744240

Author SHA1 Message Date
zhangsiqi fe5e744240 Merge remote-tracking branch 'origin/dev' into dev
3 months ago
zhangsiqi 4c7b2a82d9 [feat]: 修改：采购入库调换入库部门判定输入
3 months ago
zhangsiqi ffa55488d7 Merge remote-tracking branch 'origin/dev' into dev
3 months ago
zhangsiqi d960ebc3fb [feat]: 修改：采购计划转采购订单新增时采购订单的修改页面样式排序，修改每个表的最小高度
3 months ago
2 changed files with 24 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats
  1. 8
      ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
  2. 31
      ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html

8
ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java
View File

@ -509,7 +509,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
warehouseStorageOrderDetail.setWarehouseStorageCode(warehouseStorageCode); warehouseStorageOrderDetail.setWarehouseStorageCode(warehouseStorageCode);
warehouseStorageOrderDetail.setWarehouseStorageType("0"); warehouseStorageOrderDetail.setWarehouseStorageType("0");
warehouseStorageOrderDetail.setMaterialDeptType("0"); warehouseStorageOrderDetail.setMaterialDeptType("0");
warehouseStorageOrderDetail.setWarehouseDeptType("0"); warehouseStorageOrderDetail.setWarehouseDeptType("1");
notifyArrivedNum = notifyArrivedNum + warehouseStorageOrderDetail.getNotifyArriveNum(); notifyArrivedNum = notifyArrivedNum + warehouseStorageOrderDetail.getNotifyArriveNum();
storageOrderDetailMapper.insertWarehouseStorageOrderDetail(warehouseStorageOrderDetail); storageOrderDetailMapper.insertWarehouseStorageOrderDetail(warehouseStorageOrderDetail);
} }
@ -519,7 +519,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
warehouseStorageOrder.setWarehouseQualityStatus("0"); warehouseStorageOrder.setWarehouseQualityStatus("0");
warehouseStorageOrder.setWarehouseStorageType("0"); warehouseStorageOrder.setWarehouseStorageType("0");
warehouseStorageOrder.setWarehouseOrderType("0"); warehouseStorageOrder.setWarehouseOrderType("0");
warehouseStorageOrder.setWarehouseDeptType("0"); warehouseStorageOrder.setWarehouseDeptType("1");
warehouseStorageOrder.setNotifyArrivedNum(notifyArrivedNum); warehouseStorageOrder.setNotifyArrivedNum(notifyArrivedNum);
warehouseStorageOrder.setCreateTime(DateUtils.getNowDate()); warehouseStorageOrder.setCreateTime(DateUtils.getNowDate());
warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName()); warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName());
@ -533,7 +533,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
warehouseStorageOrderDetail.setWarehouseStorageCode(warehouseStorageCode1); warehouseStorageOrderDetail.setWarehouseStorageCode(warehouseStorageCode1);
warehouseStorageOrderDetail.setWarehouseStorageType("0"); warehouseStorageOrderDetail.setWarehouseStorageType("0");
warehouseStorageOrderDetail.setMaterialDeptType("1"); warehouseStorageOrderDetail.setMaterialDeptType("1");
warehouseStorageOrderDetail.setWarehouseDeptType("1"); warehouseStorageOrderDetail.setWarehouseDeptType("0");
notifyArrivedNum1 = notifyArrivedNum + warehouseStorageOrderDetail.getNotifyArriveNum(); notifyArrivedNum1 = notifyArrivedNum + warehouseStorageOrderDetail.getNotifyArriveNum();
storageOrderDetailMapper.insertWarehouseStorageOrderDetail(warehouseStorageOrderDetail); storageOrderDetailMapper.insertWarehouseStorageOrderDetail(warehouseStorageOrderDetail);
} }
@ -548,7 +548,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
warehouseStorageOrder.setWarehouseQualityStatus("0"); warehouseStorageOrder.setWarehouseQualityStatus("0");
warehouseStorageOrder.setWarehouseStorageType("0"); warehouseStorageOrder.setWarehouseStorageType("0");
warehouseStorageOrder.setWarehouseOrderType("0"); warehouseStorageOrder.setWarehouseOrderType("0");
warehouseStorageOrder.setWarehouseDeptType("1"); warehouseStorageOrder.setWarehouseDeptType("0");
warehouseStorageOrder.setNotifyArrivedNum(notifyArrivedNum1); warehouseStorageOrder.setNotifyArrivedNum(notifyArrivedNum1);
warehouseStorageOrder.setCreateTime(DateUtils.getNowDate()); warehouseStorageOrder.setCreateTime(DateUtils.getNowDate());
warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName()); warehouseStorageOrder.setCreateBy(ShiroUtils.getLoginName());

31
ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/addPurchaseOrder.html
View File

@ -239,8 +239,7 @@
tableSetup($supplierInfo, tableId); tableSetup($supplierInfo, tableId);
}); });
// 给实际采购数的输入框绑定事件处理器 // 给实际采购数的输入框绑定事件处理器
$('.actualPurchaseNum').off('keyup').on('keyup', function(event) { $('.actualPurchaseNum').off('blur').on('blur', function(event) {
if (event.keyCode === 13) {
var $supplierInfo = $(this).closest('.supplier-card'); var $supplierInfo = $(this).closest('.supplier-card');
var $supplierCard = $(this).closest('.supplier_card'); var $supplierCard = $(this).closest('.supplier_card');
var crad = $supplierInfo.attr('id'); var crad = $supplierInfo.attr('id');
@ -260,16 +259,15 @@
$supplierCard.find('.actualPurchaseNum').each(function () { $supplierCard.find('.actualPurchaseNum').each(function () {
actualPurchaseNum += parseInt($(this).val()) || 0; actualPurchaseNum += parseInt($(this).val()) || 0;
}); });
if (actualPurchaseNum > maxPurchaseNum) { // if (actualPurchaseNum > maxPurchaseNum) {
actualPurchaseNum - maxPurchaseNum; // actualPurchaseNum - maxPurchaseNum;
} // }
// 更新供应商采购总价 // 更新供应商采购总价
$supplierInfo.find('.supplierPurchaseTotal').val(parseFloat(Number(purchaseNum * noRmbPrice).toFixed(2))); $supplierInfo.find('.supplierPurchaseTotal').val(parseFloat(Number(purchaseNum * noRmbPrice).toFixed(2)));
if (rmbPrice) { if (rmbPrice) {
$supplierInfo.find('.supplierPurchaseTotalRmb').val(parseFloat(Number(purchaseNum * rmbPrice).toFixed(2))); $supplierInfo.find('.supplierPurchaseTotalRmb').val(parseFloat(Number(purchaseNum * rmbPrice).toFixed(2)));
} }
// 如果采购数量大于0，则显示供应商采购总价 // 如果采购数量大于0，则显示供应商采购总价
if (purchaseNum > 0) { if (purchaseNum > 0) {
$supplierInfo.find('.supplierPurchaseTotal').removeClass('hidden'); $supplierInfo.find('.supplierPurchaseTotal').removeClass('hidden');
@ -281,7 +279,6 @@
} }
recalculateTotals(tableId); // 重新计算当前物料的合计 recalculateTotals(tableId); // 重新计算当前物料的合计
}
}); });
// 定义一个函数来重新计算当前物料的合计 // 定义一个函数来重新计算当前物料的合计
// 初始化总计 // 初始化总计
@ -306,11 +303,11 @@
totalActualPurchase = totalActualPurchase + purchaseNum; totalActualPurchase = totalActualPurchase + purchaseNum;
}); });
// 物料的实际采购数合计 // 物料的实际采购数合计
$('#materialAmountSum_' + tableId).val(totalActualPurchase); $('#materialAmountSum_' + tableId).val(parseFloat(totalActualPurchase.toFixed(2)));
//物料的实际不含税采购总价: // 物料的实际不含税采购总价
$('#materialNoRmbSum_' + tableId).val(parseFloat(totalNoRmb)); $('#materialNoRmbSum_' + tableId).val(parseFloat(totalNoRmb.toFixed(2)));
//物料的实际含税总价: // 物料的实际含税总价
$('#materialRmbSum_' + tableId).val(parseFloat(totalRmb)); $('#materialRmbSum_' + tableId).val(parseFloat(totalRmb.toFixed(2)));
// 采购物料合计 // 采购物料合计
materialActualPurchaseSum(); materialActualPurchaseSum();
} }
@ -342,9 +339,9 @@
//采购数量合计 //采购数量合计
$('#purchaseSum').val(totalActualPurchase); $('#purchaseSum').val(totalActualPurchase);
//采购不含税总价 //采购不含税总价
$('#purchaseNoRmbSum').val(totalNoRmb); $('#purchaseNoRmbSum').val(parseFloat(totalNoRmb.toFixed(2)));
//采购含税总价 //采购含税总价
$('#purchaseRmbSum').val(totalRmb); $('#purchaseRmbSum').val(parseFloat(totalRmb.toFixed(2)));
} }
function tableSetup(element, tableId) { function tableSetup(element, tableId) {
var $totalSection = $('<div class="card">' + var $totalSection = $('<div class="card">' +
@ -352,19 +349,19 @@
'<div class="col-xs-4">' + '<div class="col-xs-4">' +
'<label for="actualPurchaseTotal" class="col-sm-5">实际采购数合计:</label>' + '<label for="actualPurchaseTotal" class="col-sm-5">实际采购数合计:</label>' +
'<div class="col-sm-6">' + '<div class="col-sm-6">' +
'<input type="number" name="materialAmountSum" class="form-control actualPurchaseTotalSum" id="materialAmountSum_' + tableId + '" >' + '<input type="number" name="materialAmountSum" class="form-control actualPurchaseTotalSum" id="materialAmountSum_' + tableId + '" readonly>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'<div class="col-xs-4">' + '<div class="col-xs-4">' +
'<label for="actualPurchaseTotal" class="col-sm-5">不含税采购总价:</label>' + '<label for="actualPurchaseTotal" class="col-sm-5">不含税采购总价:</label>' +
'<div class="col-sm-6">' + '<div class="col-sm-6">' +
'<input type="number" name="materialNoRmbSum" class="form-control actualPurchaseTotal" id="materialNoRmbSum_' + tableId + '" >' + '<input type="number" name="materialNoRmbSum" class="form-control actualPurchaseTotal" id="materialNoRmbSum_' + tableId + '" readonly>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'<div class="col-xs-4">' + '<div class="col-xs-4">' +
'<label for="actualPurchaseTotalTax" class="col-sm-5">含税采购总价:</label>' + '<label for="actualPurchaseTotalTax" class="col-sm-5">含税采购总价:</label>' +
'<div class="col-sm-6">' + '<div class="col-sm-6">' +
'<input type="number" name="materialRmbSum" class="form-control actualPurchaseTotalTax" id="materialRmbSum_' + tableId + '" >' + '<input type="number" name="materialRmbSum" class="form-control actualPurchaseTotalTax" id="materialRmbSum_' + tableId + '" readonly>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'</div>'+ '</div>'+

Write Preview
Loading…
Cancel
Save