专账修复

jmai-physic/src/main/java/com/jmai/physic/dto/BillDTO.java

@@ -29,4 +29,7 @@ public class BillDTO {
     @ApiModelProperty(value = "厂家名称")
     @ApiModelProperty(value = "厂家名称")
     private String factoryName;
     private String factoryName;
 
 
+    @ApiModelProperty(value = "相关申请、入库id")
+    private Long refId;
+
 }
 }

jmai-physic/src/main/java/com/jmai/physic/entity/PhysicBill.java

@@ -44,6 +44,9 @@ public class PhysicBill extends BaseVersionEntity {
     @ApiModelProperty(value = "发出")
     @ApiModelProperty(value = "发出")
     private Integer expendNum;
     private Integer expendNum;
 
 
+    @ApiModelProperty(value = "相关申请、入库id")
+    private Long refId;
+
 
 
     @ApiModelProperty(value = "状态 0 -待验收 1 -已完成")
     @ApiModelProperty(value = "状态 0 -待验收 1 -已完成")
     private Integer status;
     private Integer status;

jmai-physic/src/main/java/com/jmai/physic/service/impl/PhysicApplyServiceImpl.java

@@ -202,14 +202,16 @@ public class PhysicApplyServiceImpl extends AbstractService implements PhysicApp
             billDTO.setType(1);
             billDTO.setType(1);
             billDTO.setPhysicNum(physicApply.getActualNum());
             billDTO.setPhysicNum(physicApply.getActualNum());
             billDTO.setDeptId(physicApply.getLyDeptId());
             billDTO.setDeptId(physicApply.getLyDeptId());
+            billDTO.setRefId(physicApply.getId());
             physicBillService.createBill(billDTO);
             physicBillService.createBill(billDTO);
 
 
             BillDTO billDTO2 = new BillDTO();
             BillDTO billDTO2 = new BillDTO();
-            BeanUtil.copyProperties(physicApply,billDTO);
+            BeanUtil.copyProperties(physicApply,billDTO2);
             billDTO2.setType(2);
             billDTO2.setType(2);
             billDTO2.setPhysicNum(physicApply.getActualNum());
             billDTO2.setPhysicNum(physicApply.getActualNum());
             billDTO2.setDeptId(physicApply.getFyDeptId());
             billDTO2.setDeptId(physicApply.getFyDeptId());
-            physicBillService.createBill(billDTO);
+            billDTO2.setRefId(physicApply.getId());
+            physicBillService.createBill(billDTO2);
         }
         }
         return getInfo(physicApplySignReq.getPhysicApplyId());
         return getInfo(physicApplySignReq.getPhysicApplyId());
     }
     }

jmai-physic/src/main/java/com/jmai/physic/vo/BillInfoVO.java

@@ -14,4 +14,6 @@ public class BillInfoVO {
 
 
     @ApiModelProperty(value = "厂家名称")
     @ApiModelProperty(value = "厂家名称")
     private String factoryName;
     private String factoryName;
+
+
 }
 }

jmai-physic/src/main/resources/mapper/PhysicBillMapper.xml

@@ -4,14 +4,17 @@
 
 
 
 
     <select id="selectSumByBatchNo" resultType="java.lang.Integer">
     <select id="selectSumByBatchNo" resultType="java.lang.Integer">
-        select (IFNULL(sum(expend_num),0) - IFNULL(sum(acquire_num),0))  from physic_bill where physic_name=#{name} and physic_spec=#{spec} and batch_no=#{batchNo} and factory_name =#{factoryName}
+        select (IFNULL(sum(acquire_num),0) - IFNULL(sum(expend_num),0))  from physic_bill where
+        physic_name=#{name} and physic_spec=#{spec} and batch_no=#{batchNo} and factory_name =#{factoryName} and dept_id =#{deptId}
 
 
     </select>
     </select>
     <select id="selectSumByName" resultType="java.lang.Integer">
     <select id="selectSumByName" resultType="java.lang.Integer">
-        select (IFNULL(sum(expend_num),0) - IFNULL(sum(acquire_num),0))  from physic_bill where physic_name=#{name} and physic_spec=#{spec}  and factory_name =#{factoryName} and dept_id =#{deptId}
+        select (IFNULL(sum(acquire_num),0) - IFNULL(sum(expend_num),0))  from physic_bill where
+         physic_name=#{name} and physic_spec=#{spec}  and factory_name =#{factoryName} and dept_id =#{deptId}
     </select>
     </select>
     <select id="selectByGroup" resultType="com.jmai.physic.vo.BillInfoVO">
     <select id="selectByGroup" resultType="com.jmai.physic.vo.BillInfoVO">
-         select physic_name,physic_spec,factory_name from physic_bill where physic_name LIKE CONCAT('%', #{physicName}, '%') group by physic_name,physic_spec,factory_name,dept_id
+         select physic_name,physic_spec,factory_name from physic_bill
+         where physic_name LIKE CONCAT('%', #{physicName}, '%') group by physic_name,physic_spec,factory_name,dept_id
     </select>
     </select>
     <select id="selectBillPage" resultType="com.jmai.physic.vo.BillQueryVO">
     <select id="selectBillPage" resultType="com.jmai.physic.vo.BillQueryVO">
         select *,b.dept_name from physic_bill a left join sys_dept b  on a.dept_id =b.id where a.physic_name =#{req.physicName} and
         select *,b.dept_name from physic_bill a left join sys_dept b  on a.dept_id =b.id where a.physic_name =#{req.physicName} and