diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..48e341a --- /dev/null +++ b/package-lock.json @@ -0,0 +1,3 @@ +{ + "lockfileVersion": 1 +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index 2858f30..32e158e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -13,7 +13,10 @@ import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.enums.DataSourceType; import com.ruoyi.system.domain.cost; import com.ruoyi.system.domain.material; +import com.ruoyi.system.domain.temp; 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.springframework.beans.factory.annotation.Autowired; 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) @PreAuthorize("@ss.hasPermi('system:user:export')") @PostMapping("/export") @@ -882,7 +885,7 @@ public class SysUserController extends BaseController batchInsert.insertMaterialBatch(materials); batchInsert.insertCostBatch(costs); - }*/ + }**/ @DataSource(DataSourceType.QUOT) public void insertMaterialBatch(List temp) { diff --git a/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml b/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml index cc5d2c4..276983f 100644 --- a/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/material/CMaterialMapper.xml @@ -123,7 +123,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into c_material_cost( cost_material_id, cost_cl_id, cost_cl_qty, cost_cl_qty_2) values - ( #{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))) diff --git a/ruoyi-ui/src/views/material/material/index.vue b/ruoyi-ui/src/views/material/material/index.vue index 31543f7..c1aefa5 100644 --- a/ruoyi-ui/src/views/material/material/index.vue +++ b/ruoyi-ui/src/views/material/material/index.vue @@ -412,6 +412,7 @@ export default { getMaterial(materialId).then(response => { this.form = response.data; this.cMaterialCostList = response.data.cmaterialCostList; + console.log(response.data.cmaterialCostList) this.open = true; this.title = "修改物料管理"; this.getClMaterials(); @@ -423,7 +424,8 @@ export default { submitForm() { this.$refs["form"].validate(valid => { if (valid) { - this.form.cMaterialCostList = this.cMaterialCostList; + this.form.cmaterialCostList = this.cMaterialCostList; + console.log(this.form.cMaterialCostList) if (this.form.materialId != null) { updateMaterial(this.form).then(response => { this.$modal.msgSuccess("修改成功");