hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java
@@ -88,6 +88,10 @@ //搅拌站 (2023-11-14) 添加原料 入站 @PostMapping("/mixingInsert") public BasicResult mixingInsert(@RequestBody HashMap<String,Object> values) { System.out.println("-------"); System.out.println("-------"); System.out.println("-------"); System.out.println(values); return materialReleaseService.mixingInsert(values); } @@ -131,6 +135,17 @@ return materialReleaseService.siloMixingList(values); } //搅拌站 (2023-11-14) 修改 @PostMapping("/mixingUpdate") public BasicResult mixingUpdate(@RequestBody HashMap<String,Object> values) { return materialReleaseService.mixingUpdate(values); } //搅拌站 删除 @PostMapping("/mixingDel") public BasicResult mixingDel(@RequestBody HashMap<String,Object> values) { return materialReleaseService.mixingDel(values); } } hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java
@@ -28,7 +28,7 @@ List<TRawMaterial> materialRew(Integer byId); void mixingInsert(@Idkey("mixingId") TMixing mixing); void mixingInsert(@Idkey("mixingId") Map<String,Object> mixing); List<TMixing> mixingList(HashMap<String, Object> values); @@ -38,7 +38,7 @@ void mixingConsumeIn(@Idkey("mixingSignboardId") Map<String, Object> values); void mixingConsumeInTwo(@Idkey("mixingConsumeId") TMixingConsume mixingConsume); void mixingConsumeInTwo(@Idkey("mixingConsumeId") Map<String,Object> mixingConsume); Integer starInt(); @@ -55,4 +55,8 @@ void mixingUpdateType(String siloId); List<TMixing> siloMixingList(Map<String, Object> values); void mixingUpdate(Map<String, Object> mixing); void mixingDel(String mixingId); } hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java
@@ -37,4 +37,8 @@ BasicResult siloPull(); BasicResult siloMixingList(Map<String, Object> values); BasicResult mixingUpdate(HashMap<String, Object> values); BasicResult mixingDel(HashMap<String, Object> values); } hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java
@@ -222,10 +222,12 @@ @Override public BasicResult mixingInsert(HashMap<String, Object> values) { List<TMixing> mixingList = (List<TMixing>) values.get("mixingList"); for (TMixing mixing : mixingList){ materialReleaseMappper.mixingUpdateType(mixing.getSiloId()); mixing.setTypes(1); List<Map<String,Object>> mixingList = (List<Map<String,Object>>) values.get("mixingList"); for (Map<String,Object> mixing : mixingList){ materialReleaseMappper.mixingUpdateType(mixing.get("siloId").toString()); mixing.put("types",1); mixing.put("mixingId",""); mixing.put("stata",2); materialReleaseMappper.mixingInsert(mixing); } return BasicResult.success(); @@ -258,10 +260,11 @@ materialReleaseMappper.mixingConsumeIn(values); String mixingSignboardId = values.get("mixingSignboardId").toString(); Integer star = materialReleaseMappper.starInt(); List<TMixingConsume> mixingConsumes = (List<TMixingConsume>) values.get("mixingConsume"); for (TMixingConsume mixingConsume :mixingConsumes){ mixingConsume.setMixingSignboardId(mixingSignboardId); mixingConsume.setStar(star+1); List<Map<String,Object>> mixingConsumes = (List<Map<String,Object>>) values.get("mixingConsume"); for (Map<String,Object> mixingConsume :mixingConsumes){ mixingConsume.put("mixingSignboardId",mixingSignboardId); mixingConsume.put("star",star+1); mixingConsume.put("mixingConsumeId",""); materialReleaseMappper.mixingConsumeInTwo(mixingConsume); } return BasicResult.success(); @@ -299,4 +302,22 @@ List<TMixing> tMixings = materialReleaseMappper.siloMixingList(values); return BasicResult.success(tMixings); } @Override public BasicResult mixingUpdate(HashMap<String, Object> values) { List<Map<String,Object>> mixingList = (List<Map<String,Object>>) values.get("mixingList"); for (Map<String,Object> mixing : mixingList){ materialReleaseMappper.mixingUpdate(mixing); } return BasicResult.success(); } @Override public BasicResult mixingDel(HashMap<String, Object> values) { List<String> mixingList = (List<String>) values.get("mixingIds"); for (String mixingId : mixingList){ materialReleaseMappper.mixingDel(mixingId); } return BasicResult.success(); } } hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml
@@ -163,7 +163,7 @@ from t_raw_material where Piece=#{byId} </select> <insert id="mixingInsert" parameterType="com.thhy.materials.modules.biz.concret.entity.TMixing"> <insert id="mixingInsert" > insert into t_mixing <trim prefix="(" suffix=")" suffixOverrides=","> <if test="mixingId != null"> @@ -327,7 +327,7 @@ </if> </trim> </insert> <insert id="mixingConsumeInTwo" parameterType="com.thhy.materials.modules.biz.concret.entity.TMixingConsume"> <insert id="mixingConsumeInTwo" > insert into t_mixing_consume <trim prefix="(" suffix=")" suffixOverrides=","> <if test="mixingConsumeId != null"> @@ -440,9 +440,11 @@ </select> <select id="mixingConsumePull" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingSignboard"> select mixing_signboard_id as mixingSignboardId, signboard_name as signboardName from t_mixing_signboard tms.mixing_signboard_id as mixingSignboardId, tms.signboard_name as signboardName, sp.pro_name as proName from t_mixing_signboard tms left join sys_project sp on tms.pro_id=sp.pro_id </select> <select id="siloPull" resultType="com.thhy.materials.modules.biz.concret.entity.TSilo"> select silo_id as siloId, @@ -468,7 +470,8 @@ tm.silo_id as siloId, tm.percentage as percentage, tm.inspect_date as inspectDate, ts.silo_name as siloName ts.silo_name as siloName, ts.types as types FROM t_silo ts LEFT JOIN t_mixing tm ON ts.silo_id=tm.silo_id @@ -483,5 +486,49 @@ and tm.in_date between #{strTime} and #{endTime} </if> </select> <update id="mixingUpdate" > update t_mixing <set> <if test="material != null"> material = #{material,jdbcType=VARCHAR}, </if> <if test="spec != null"> spec = #{spec,jdbcType=VARCHAR}, </if> <if test="producer != null"> producer = #{producer,jdbcType=VARCHAR}, </if> <if test="stove != null"> stove = #{stove,jdbcType=VARCHAR}, </if> <if test="inNum != null"> in_num = #{inNum,jdbcType=VARCHAR}, </if> <if test="inDate != null"> in_date = #{inDate,jdbcType=VARCHAR}, </if> <if test="inspectState != null"> inspect_state = #{inspectState,jdbcType=INTEGER}, </if> <if test="reportNumber != null"> report_number = #{reportNumber,jdbcType=VARCHAR}, </if> <if test="stata != null"> stata = #{stata}, </if> <if test="siloId != null"> silo_id = #{siloId}, </if> <if test="percentage != null"> percentage = #{percentage}, </if> <if test="inspectDate != null"> inspect_date = #{inspectDate}, </if> </set> where mixing_id = #{mixingId,jdbcType=VARCHAR} </update> <delete id="mixingDel" parameterType="java.lang.String"> delete from t_mixing where mixing_id=#{mixingId} </delete> </mapper> hd/pipe/materialsManage/src/main/resources/mapping/WeighMapper.xml
@@ -728,7 +728,7 @@ from sys_steel </select> <select id="assistGoodInventory" resultType="com.thhy.materials.modules.biz.weigh.entity.dto.AssistGoodDto"> select s.assist_name as s.assistName, select s.assist_name as assistName, d.dict_name as assistType, s.stock as stock from sys_assist_good s left join sys_dict d on s.assist_type=d.dict_id
