src/main/java/org/springblade/modules/process/controller/ProcessController.java
@@ -125,6 +125,7 @@ farmProductStockService.stockReduce(process.getSaleNum(),process.getProid()); //向加工产品库存表中添加数据 ProcessInv processInv = new ProcessInv(); processInv.setFpsId(process.getProid()); processInv.setProductId(Long.parseLong(process.getProcessId())); processInv.setProductInventoryNum(process.getProcessNum()); processInv.setStrainId(Long.parseLong(process.getStrainId())); src/main/java/org/springblade/modules/processInv/entity/ProcessInv.java
@@ -49,8 +49,8 @@ */ private Double productInventoryNum; /** * 农场id * 农产品库存id主键 */ private String farmId; private String fpsId; } src/main/java/org/springblade/modules/processInv/mapper/ProcessInvMapper.xml
@@ -24,9 +24,14 @@ from sys_process_inv inv LEFT JOIN sys_machining m ON m.id = inv.product_id LEFT JOIN sys_strain strain ON strain.id = inv.strain_id LEFT JOIN sys_farm_product_stock fps ON inv.fps_id = fps.id LEFT JOIN sys_land land ON land.id = fps.land_id where inv.is_deleted = 0 <if test="processInv.farmId != null and processInv.farmId != ''"> AND inv.farm_id = #{processInv.farmId} <if test="processInv.fpsId != null and processInv.fpsId != ''"> AND inv.fps_id = #{processInv.fpsId} </if> <if test="processInv.farmId != null and processInv.farmId !=''"> AND land.farm_id = #{processInv.farmId} </if> </select> @@ -36,8 +41,8 @@ </select> <insert id="add"> INSERT INTO sys_process_inv (strain_id,product_id,product_inventory_num,create_time,status,is_deleted) VALUES (#{processInv.strainId},#{processInv.productId},#{processInv.productInventoryNum},NOW(),1,0) INSERT INTO sys_process_inv (strain_id,product_id,product_inventory_num,create_time,status,is_deleted,fps_id) VALUES (#{processInv.strainId},#{processInv.productId},#{processInv.productInventoryNum},NOW(),1,0,#{processInv.fpsId}) </insert> <select id="stockCompare" resultType="java.lang.Boolean"> src/main/java/org/springblade/modules/processInv/service/impl/ProcessInvServiceImpl.java
@@ -49,6 +49,7 @@ processInv1.setProductInventoryNum(processInv1.getProductInventoryNum()+processInv.getProductInventoryNum()); processInv1.setUpdateTime(new Date()); processInv1.setUpdateUser(processInv.getUpdateUser()); processInv1.setFpsId(processInv.getFpsId()); return baseMapper.updateById(processInv1)>0; }else { //不存在该数据时添加 src/main/java/org/springblade/modules/processInv/vo/ProcessInvVO.java
@@ -43,4 +43,8 @@ * 品种名 */ private String strainName; /** * 农场id */ private String farmId; }