Merge remote-tracking branch 'origin/dev' into dev

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/MachIneDto.java

@@ -102,7 +102,7 @@ public class MachIneDto {
     /**
      * 数量
      */
-    @ApiModelProperty(value = "数量")
+    @ApiModelProperty(value = "上方页面入库数量")
     private Double num;
 
     /**
@@ -114,6 +114,18 @@ public class MachIneDto {
     /**
      * 入库数量
      */
-    @ApiModelProperty(value = "入库数量")
+    @ApiModelProperty(value = "表单集合入库数量")
     private Double putInStoreNum;
+
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(value = "单位名称")
+    private String unitId;
+
+    /**
+     * 工程名称
+     */
+    @ApiModelProperty(value = "工程名称")
+    private String proId;
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SavePutInfoDto.java

@@ -90,7 +90,7 @@ public class SavePutInfoDto extends BaseEntity {
      * 工程名称
      */
     @ApiModelProperty(value = "工程名称")
-    private String projectId;
+    private String proId;
 
     /**
      * 创建者

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/mapper/InventoryAndWarehousingMapper.java

@@ -23,7 +23,7 @@ public interface InventoryAndWarehousingMapper {
     List<PutInStorageBean> getList(PutInStorageBean bean);
 
     /**
-     * ma_type_put_in_storage_details表
+     * 新增ma_type_put_in_storage_details表
      * @param machIneDto
      * @return
      */
@@ -38,19 +38,31 @@ public interface InventoryAndWarehousingMapper {
 
     /**
      * 更新matype表中num数量
-     * @param
+     * @param typeId
+     * @param num
+     * @return
      */
     int updateMaType(@Param("typeId") String typeId, @Param("num") Double num);
 
     /**
      * 新增ma_machine表
-     * @param
+     * @param machIneDto
      * @return
      */
     int insertMachine(MachIneDto machIneDto);
 
+    /**
+     * 新增ma_machine_label
+     * @param machIneDto
+     * @return
+     */
     int insertMachineLabel(MachIneDto machIneDto);
 
+    /**
+     * 新增ma_label_bind
+     * @param machIneDto
+     * @return
+     */
     int insertLabelBind(MachIneDto machIneDto);
 
     /**
@@ -60,5 +72,4 @@ public interface InventoryAndWarehousingMapper {
      */
     int selectByCode(String code);
 
-    int selectById(Integer id);
 }

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/InventoryAndWarehousingServiceImpl.java

@@ -121,6 +121,8 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
             machIneDto.setPutInType(dto.getPutInType());
             machIneDto.setNum(dto.getNum());
             machIneDto.setCheckMan(dto.getCheckMan());
+            machIneDto.setUnitId(dto.getUnitId());
+            machIneDto.setProId(dto.getProId());
             res += insertMachineInfo(machIneDto);
         }
         return res;
@@ -176,6 +178,8 @@ public class InventoryAndWarehousingServiceImpl implements InventoryAndWarehousi
             machIneDto.setCreator(dto.getCreator());
             machIneDto.setPutInType(dto.getPutInType());
             machIneDto.setRemarks(dto.getRemarks());
+            machIneDto.setUnitId(dto.getUnitId());
+            machIneDto.setProId(dto.getProId());
             res += insertTypePutInStorageInfo(machIneDto);
             //根据类型追加ma_type表里面的num
             res += updateMaTypeInfo(machIneDto.getTypeId(), machIneDto.getPutInStoreNum());

sgzb-modules/sgzb-material/src/main/resources/mapper/material/InventoryAndWarehousingMapper.xml

@@ -58,6 +58,8 @@
                 </otherwise>
             </choose>
             <if test="creator != null and creator != ''">CREATOR,</if>
+            <if test="unitId != null and unitId != ''">UNIT_ID,</if>
+            <if test="proId != null and proId != ''">PROJECT_ID,</if>
             CREATE_DATE,
             <choose>
                 <when test="isCode and remarks != null and remarks != ''">
@@ -84,6 +86,8 @@
                 </otherwise>
             </choose>
             <if test="creator != null and creator != ''">#{creator},</if>
+            <if test="unitId != null and unitId != ''">#{unitId},</if>
+            <if test="proId != null and proId != ''">#{proId},</if>
             sysdate(),
             <choose>
                 <when test="isCode and remarks != null and remarks != ''">
@@ -194,10 +198,4 @@
             <if test="code != null ">and qr_code = #{code}</if>
         </where>
     </select>
-    <select id="selectById" resultType="java.lang.Integer">
-        select info from ma_type_put_in_storage_details
-        <where>
-            <if test="id != null">and ID = #{id}</if>
-        </where>
-    </select>
 </mapper>