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

修改：销售订单SQL语句修改creatBy对象为createBy 修改：销售订单新增修改，添加物料时改为物料多选

dev
zhangsiqi 3 months ago
parent
f3e5f90a59
commit
7d51ebf054
3 changed files with 89 additions and 77 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 Download Patch File Download Diff File
  1. 4
      ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
  2. 86
      ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
  3. 76
      ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html

4
ruoyi-admin/src/main/resources/mapper/system/SysSalesOrderMapper.xml
View File

@ -135,7 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach> </foreach>
</if> </if>
</where> </where>
order by s.create_time desc order by s.audit_status,s.create_time desc
</select> </select>
<select id="selectSysSalesOrderById" parameterType="Long" resultMap="SysSalesOrderResult"> <select id="selectSysSalesOrderById" parameterType="Long" resultMap="SysSalesOrderResult">
<include refid="selectSysSalesOrderVo"/> <include refid="selectSysSalesOrderVo"/>
@ -269,7 +269,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="applyTime != null">#{applyTime},</if> <if test="applyTime != null">#{applyTime},</if>
<if test="applyTitle != null">#{applyTitle},</if> <if test="applyTitle != null">#{applyTitle},</if>
<if test="createTime!= null">#{createTime},</if> <if test="createTime!= null">#{createTime},</if>
<if test="creatBy != null">#{creatBy},</if> <if test="createBy != null">#{createBy},</if>
now() now()
</trim> </trim>
</insert> </insert>

86
ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html
View File

@ -325,8 +325,8 @@
{checkbox: true}, {checkbox: true},
{field: 'index',align: 'center', title: "序号", {field: 'index',align: 'center', title: "序号",
formatter: function (value, row, index,column) { formatter: function (value, row, index,column) {
return $.table.serialNumber(index) - 1; return $.table.serialNumber(index) - 1;
} }
}, },
{title: '物料索引id',field: 'materialId',align: 'center',visible: false}, {title: '物料索引id',field: 'materialId',align: 'center',visible: false},
{title: '料号',field: 'materialCode',align: 'center'}, {title: '料号',field: 'materialCode',align: 'center'},
@ -846,48 +846,54 @@
$("#form-salesOrder-add").validate({focusCleanup: true}); $("#form-salesOrder-add").validate({focusCleanup: true});
function doSubmit(index, layero,uniqueId){ function doSubmit(index, layero,uniqueId){
var iframeWin = window[layero.find('iframe')[0]['name']]; var iframeWin = window[layero.find('iframe')[0]['name']];
var rowData = iframeWin.$('#bootstrap-select-table').bootstrapTable('getSelections')[0]; var rowData = iframeWin.$('#bootstrap-select-table').bootstrapTable('getSelections');
//判断是否重复 //判断是否重复
var rows = $("#bootstrap-sub-table-order").bootstrapTable('getData').length; var rows = $("#bootstrap-sub-table-order").bootstrapTable('getData').length;
for(var i=0;i<rows;i++){ for(var j=0;i<rows;j++){
var data = $("#bootstrap-sub-table-order").bootstrapTable('getData')[i]; var data = $("#bootstrap-sub-table-order").bootstrapTable('getData');
if(data.materialCode==rowData.materialNo){ for (var i = 0;i<data.length;j++){
$.modal.alertError("不能选择已添加过的相同料号"); if(data[j].materialNo==rowData[j].materialNo){
return; //如果是物料料号的相同，则从rowData清除相同的料号物料
rowData.splice(j,1);
$.modal.alertError("不能选择已添加过的相同料号" + rowData[j].materialNo);
return;
}
} }
} }
$("#bootstrap-sub-table-order").bootstrapTable('insertRow', { for(var i=0;i<rowData.length;i++) {
index:1, $("#bootstrap-sub-table-order").bootstrapTable('insertRow', {
row: { index: 1,
materialId:rowData.id, row: {
materialCode: rowData.materialNo, materialId: rowData[i].id,
materialName: rowData.materialName, materialCode: rowData[i].materialNo,
materialType: rowData.materialType, materialName: rowData[i].materialName,
describe: rowData.describe, materialType: rowData[i].materialType,
brand: rowData.brand, describe: rowData[i].describe,
unit: rowData.unit, brand: rowData[i].brand,
processMethod: rowData.processMethod, unit: rowData[i].unit,
photoUrl: rowData.photoUrl, processMethod: rowData[i].processMethod,
warehouseDept: rowData.warehouseDept, photoUrl: rowData[i].photoUrl,
countTax: $("#taxRate_add").val(), warehouseDept: rowData[i].warehouseDept,
usdTax: $("#usdTax_add").val(), countTax: $("#taxRate_add").val(),
materialSole: 0, usdTax: $("#usdTax_add").val(),
materialNum: "", materialSole: 0,
materialNoRmb: 0.00, materialNum: "",
materialNoUsd: 0.00, materialNoRmb: 0.00,
materialRmb: 0.00, materialNoUsd: 0.00,
materialNoRmbSum: 0.00, materialRmb: 0.00,
materialRmbSum: 0.00, materialNoRmbSum: 0.00,
materialUsd: 0.00, materialRmbSum: 0.00,
materialUsdSum: 0.00, materialUsd: 0.00,
materialNoUsdSum: 0.00, materialUsdSum: 0.00,
createBy: "", materialNoUsdSum: 0.00,
createTime: "", createBy: "",
updateBy: "", createTime: "",
updateTime: "", updateBy: "",
remark: "", updateTime: "",
} remark: "",
}) }
})
}
layer.close(index); layer.close(index);
} }
function insertRow() { function insertRow() {

76
ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html
View File

@ -688,51 +688,57 @@
function doSubmit(index, layero,uniqueId){ function doSubmit(index, layero,uniqueId){
var iframeWin = window[layero.find('iframe')[0]['name']]; var iframeWin = window[layero.find('iframe')[0]['name']];
var rowData = iframeWin.$('#bootstrap-select-table').bootstrapTable('getSelections')[0]; var rowData = iframeWin.$('#bootstrap-select-table').bootstrapTable('getSelections');
var totalNum = $("#bootstrap-select-table").bootstrapTable('getData').length; var totalNum = $("#bootstrap-select-table").bootstrapTable('getData').length;
var rmb1 = $("#taxRate_edit").val(); var rmb1 = $("#taxRate_edit").val();
if (rmb1== null){ if (rmb1== null){
rmb1 = 0; rmb1 = 0;
} }
var rows = $("#bootstrap-table-editOrder").bootstrapTable('getData').length; var rows = $("#bootstrap-table-editOrder").bootstrapTable('getData').length;
for(var i=0;i<rows;i++){ for(var j=0;i<rows;j++){
var data = $("#bootstrap-table-editOrder").bootstrapTable('getData')[i]; var data = $("#bootstrap-table-editOrder").bootstrapTable('getData');
if(data.materialCode==rowData.materialNo){ for (var i = 0;i<data.length;j++){
$.modal.alertError("不能选择已添加过的相同料号"); if(data[j].materialNo==rowData[j].materialNo){
return; //如果是物料料号的相同，则从rowData清除相同的料号物料
rowData.splice(j,1);
$.modal.alertError("不能选择已添加过的相同料号" + rowData[j].materialNo);
return;
}
} }
} }
var rmb = parseFloat(rmb1).toFixed(2) / 100; var rmb = parseFloat(rmb1).toFixed(2) / 100;
var usd = $("#usdTax_edit").val()!=null?Number(usd).toFixed(2):0; var usd = $("#usdTax_edit").val()!=null?Number(usd).toFixed(2):0;
$("#bootstrap-table-editOrder").bootstrapTable('insertRow', { for(var i=0;i<rowData.length;i++) {
index: totalNum, $("#bootstrap-table-editOrder").bootstrapTable('insertRow', {
row: { index: totalNum,
id:'', row: {
materialId:rowData.id, id:'',
materialCode: rowData.materialNo, materialId:rowData[i].id,
materialName: rowData.materialName, materialCode: rowData[i].materialNo,
materialType: rowData.materialType, materialName: rowData[i].materialName,
describe: rowData.describe, materialType: rowData[i].materialType,
brand: rowData.brand, describe: rowData[i].describe,
photoUrl: rowData.photoUrl, brand: rowData[i].brand,
warehouseDept:rowData.warehouseDept, photoUrl: rowData[i].photoUrl,
unit: rowData.unit, warehouseDept:rowData[i].warehouseDept,
processMethod: rowData.processMethod, unit: rowData[i].unit,
countTax:rmb , processMethod: rowData[i].processMethod,
usdTax: usd, countTax:rmb ,
materialSole: rowData.materialSole, usdTax: usd,
materialNum: 0.00, materialSole: rowData[i].materialSole,
materialNoRmb: 0.00, materialNum: 0.00,
materialNoUsd: 0.00, materialNoRmb: 0.00,
materialRmb: 0.00, materialNoUsd: 0.00,
materialNoRmbSum: 0.00, materialRmb: 0.00,
materialRmbSum: 0.00, materialNoRmbSum: 0.00,
materialUsd: 0.00, materialRmbSum: 0.00,
materialUsdSum: 0.00, materialUsd: 0.00,
materialNoUsdSum: 0.00, materialUsdSum: 0.00,
remark: "", materialNoUsdSum: 0.00,
} remark: "",
}) }
})
}
layer.close(index); layer.close(index);
} }
function insertRow() { function insertRow() {

Write Preview
Loading…
Cancel
Save