xd
/
JNBusiness
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://jialcheerful.club:3000/xd/JNBusiness

This commit is contained in:
xd 2024-03-07 13:03:21 +08:00
parent 2b71871743 3224baa0cf
commit 61bc95f676
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package-lock.json generated Normal file
View File

@ -0,0 +1,3 @@
{
"lockfileVersion": 1
}

7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -13,7 +13,10 @@ import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.common.enums.DataSourceType;
import com.ruoyi.system.domain.cost; import com.ruoyi.system.domain.cost;
import com.ruoyi.system.domain.material; import com.ruoyi.system.domain.material;
import com.ruoyi.system.domain.temp;
import com.ruoyi.system.service.*; import com.ruoyi.system.service.*;
import com.ruoyi.web.Utils.batchInsert;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
@ -310,7 +313,7 @@ public class SysUserController extends BaseController
} }
/*===============================================测试====================================================*/ /*===============================================测试====================================================*/
/*@DataSource(DataSourceType.QUOT) /**@DataSource(DataSourceType.QUOT)
@Log(title = "用户管理", businessType = BusinessType.EXPORT) @Log(title = "用户管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')") @PreAuthorize("@ss.hasPermi('system:user:export')")
@PostMapping("/export") @PostMapping("/export")
@ -882,7 +885,7 @@ public class SysUserController extends BaseController
batchInsert.insertMaterialBatch(materials); batchInsert.insertMaterialBatch(materials);
batchInsert.insertCostBatch(costs); batchInsert.insertCostBatch(costs);
}*/ }**/
@DataSource(DataSourceType.QUOT) @DataSource(DataSourceType.QUOT)
public void insertMaterialBatch(List<material> temp) { public void insertMaterialBatch(List<material> temp) {

2
ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml
View File

@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert id="batchCMaterialCost"> <insert id="batchCMaterialCost">
insert into c_material_cost( cost_material_id, cost_cl_id, cost_cl_qty, cost_cl_qty_2) values insert into c_material_cost( cost_material_id, cost_cl_id, cost_cl_qty, cost_cl_qty_2) values
<foreach item="item" index="index" collection="list" separator=","> <foreach item="item" index="index" collection="list" separator=",">
( #{item.costMaterialId}, #{item.costClId}, #{item.costClQty}, #{item.costClQty2}) ( #{item.costMaterialId}, #{item.costClId}, cast(#{item.costClQty} as decimal(18,4)), cast(#{item.costClQty2} as decimal(18,4)))
</foreach> </foreach>
</insert> </insert>
</mapper> </mapper>

4
ruoyi-ui/src/views/material/material/index.vue
View File

@ -412,6 +412,7 @@ export default {
getMaterial(materialId).then(response => { getMaterial(materialId).then(response => {
this.form = response.data; this.form = response.data;
this.cMaterialCostList = response.data.cmaterialCostList; this.cMaterialCostList = response.data.cmaterialCostList;
console.log(response.data.cmaterialCostList)
this.open = true; this.open = true;
this.title = "修改物料管理"; this.title = "修改物料管理";
this.getClMaterials(); this.getClMaterials();
@ -423,7 +424,8 @@ export default {
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
this.form.cMaterialCostList = this.cMaterialCostList; this.form.cmaterialCostList = this.cMaterialCostList;
console.log(this.form.cMaterialCostList)
if (this.form.materialId != null) { if (this.form.materialId != null) {
updateMaterial(this.form).then(response => { updateMaterial(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");