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

Compare commits

base: xd:8244de84e7a10819b2ec86596c28b94ca9e2cce9
Branches Tags
xd:main
..
compare: xd:05512e19f5f664d852a8421abe55ef7834759a88
Branches Tags
xd:main

No commits in common. "8244de84e7a10819b2ec86596c28b94ca9e2cce9" and "05512e19f5f664d852a8421abe55ef7834759a88" have entirely different histories.
8244de84e7 ... 05512e19f5

4 changed files with 6 additions and 14 deletions
Show Stats Expand all files Collapse all files

3
package-lock.json generated
View File

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

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

@ -13,10 +13,7 @@ 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;
@ -86,7 +83,7 @@ public class SysUserController extends BaseController
return getDataTable(list);
}
/*@Log(title = "用户管理", businessType = BusinessType.EXPORT)
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')")
@PostMapping("/export")
public void export(HttpServletResponse response, SysUser user)
@ -94,7 +91,7 @@ public class SysUserController extends BaseController
List<SysUser> list = userService.selectUserList(user);
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
util.exportExcel(response, list, "用户数据");
}*/
}
@Log(title = "用户管理", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:user:import')")
@ -313,7 +310,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")
@ -885,7 +882,7 @@ public class SysUserController extends BaseController
batchInsert.insertMaterialBatch(materials);
batchInsert.insertCostBatch(costs);
}
}*/
@DataSource(DataSourceType.QUOT)
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 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=",">
( #{item.costMaterialId}, #{item.costClId}, cast(#{item.costClQty} as decimal(18,4)), cast(#{item.costClQty2} as decimal(18,4)))
( #{item.costMaterialId}, #{item.costClId}, #{item.costClQty}, #{item.costClQty2})
</foreach>
</insert>
</mapper>

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

@ -412,7 +412,6 @@ 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();
@ -424,8 +423,7 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.cmaterialCostList = this.cMaterialCostList;
console.log(this.form.cMaterialCostList)
this.form.cMaterialCostList = this.cMaterialCostList;
if (this.form.materialId != null) {
updateMaterial(this.form).then(response => {
this.$modal.msgSuccess("修改成功");