sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java

@@ -22,18 +22,8 @@ public class MaMachine extends BaseEntity {
   /**
    * 类型ID
    */
-  @ApiModelProperty(value = "资产属性id")
+  @ApiModelProperty(value = "类型ID")
   private long propId;
-  /**
-   * 物品种类
-   */
-  @ApiModelProperty(value = "物品种类id")
-  private long itemId;
-  /**
-   * 设备类型
-   */
-  @ApiModelProperty(value = "设备类型id")
-  private long deviceId;
   /**
    * 物品种类
    */
@@ -161,12 +151,246 @@ public class MaMachine extends BaseEntity {
   private String labelCode;
 
 
-  @ApiModelProperty(value = "筛选名称")
-  private String keyWord;
 
-  @ApiModelProperty(value = "开始时间")
-  private String beginTime;
 
-  @ApiModelProperty(value = "结束时间")
+  public void setMaId(long maId) {
-  private String endTime;
+    this.maId = maId;
+  }
+
+
+  public long getTypeId() {
+    return typeId;
+  }
+
+  public void setTypeId(long typeId) {
+    this.typeId = typeId;
+  }
+
+
+  public String getMaCode() {
+    return maCode;
+  }
+
+  public void setMaCode(String maCode) {
+    this.maCode = maCode;
+  }
+
+
+  public String getPreCode() {
+    return preCode;
+  }
+
+  public void setPreCode(String preCode) {
+    this.preCode = preCode;
+  }
+
+
+  public String getMaStatus() {
+    return maStatus;
+  }
+
+  public void setMaStatus(String maStatus) {
+    this.maStatus = maStatus;
+  }
+
+
+  public String getQrCode() {
+    return qrCode;
+  }
+
+  public void setQrCode(String qrCode) {
+    this.qrCode = qrCode;
+  }
+
+
+  public String getBuyPrice() {
+    return buyPrice;
+  }
+
+  public void setBuyPrice(String buyPrice) {
+    this.buyPrice = buyPrice;
+  }
+
+
+  public String getMaVender() {
+    return maVender;
+  }
+
+  public void setMaVender(String maVender) {
+    this.maVender = maVender;
+  }
+
+
+  public String getOutFacTime() {
+    return outFacTime;
+  }
+
+  public void setOutFacTime(String outFacTime) {
+    this.outFacTime = outFacTime;
+  }
+
+
+  public String getOutFacCode() {
+    return outFacCode;
+  }
+
+  public void setOutFacCode(String outFacCode) {
+    this.outFacCode = outFacCode;
+  }
+
+
+  public String getAssetsCode() {
+    return assetsCode;
+  }
+
+  public void setAssetsCode(String assetsCode) {
+    this.assetsCode = assetsCode;
+  }
+
+
+  public String getCheckMan() {
+    return checkMan;
+  }
+
+  public void setCheckMan(String checkMan) {
+    this.checkMan = checkMan;
+  }
+
+
+  public String getThisCheckTime() {
+    return thisCheckTime;
+  }
+
+  public void setThisCheckTime(String thisCheckTime) {
+    this.thisCheckTime = thisCheckTime;
+  }
+
+
+  public String getNextCheckTime() {
+    return nextCheckTime;
+  }
+
+  public void setNextCheckTime(String nextCheckTime) {
+    this.nextCheckTime = nextCheckTime;
+  }
+
+
+  public String getGpsCode() {
+    return gpsCode;
+  }
+
+  public void setGpsCode(String gpsCode) {
+    this.gpsCode = gpsCode;
+  }
+
+
+  public String getRfidCode() {
+    return rfidCode;
+  }
+
+  public void setRfidCode(String rfidCode) {
+    this.rfidCode = rfidCode;
+  }
+
+
+  public String getErpCode() {
+    return erpCode;
+  }
+
+  public void setErpCode(String erpCode) {
+    this.erpCode = erpCode;
+  }
+
+
+  public String getTransferCode() {
+    return transferCode;
+  }
+
+  public void setTransferCode(String transferCode) {
+    this.transferCode = transferCode;
+  }
+
+
+  public String getInOutNum() {
+    return inOutNum;
+  }
+
+  public void setInOutNum(String inOutNum) {
+    this.inOutNum = inOutNum;
+  }
+
+
+  public String getBuyTask() {
+    return buyTask;
+  }
+
+  public void setBuyTask(String buyTask) {
+    this.buyTask = buyTask;
+  }
+
+
+  public String getOwnHouse() {
+    return ownHouse;
+  }
+
+  public void setOwnHouse(String ownHouse) {
+    this.ownHouse = ownHouse;
+  }
+
+
+  public String getCompanyId() {
+    return companyId;
+  }
+
+  public void setCompanyId(String companyId) {
+    this.companyId = companyId;
+  }
+
+  public String getItemType() {
+    return itemType;
+  }
+
+  public void setItemType(String itemType) {
+    this.itemType = itemType;
+  }
+
+  public String getDeviceType() {
+    return deviceType;
+  }
+
+  public void setDeviceType(String deviceType) {
+    this.deviceType = deviceType;
+  }
+
+  public String getSpecificationType() {
+    return specificationType;
+  }
+
+  public void setSpecificationType(String specificationType) {
+    this.specificationType = specificationType;
+  }
+
+  public String getMaStatusName() {
+    return maStatusName;
+  }
+
+  public void setMaStatusName(String maStatusName) {
+    this.maStatusName = maStatusName;
+  }
+
+  public String getLabelCode() {
+    return labelCode;
+  }
+
+  public void setLabelCode(String labelCode) {
+    this.labelCode = labelCode;
+  }
+
+  public long getPropId() {
+    return propId;
+  }
+
+  public void setPropId(long propId) {
+    this.propId = propId;
+  }
 }

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/MaHouseSet.java

@@ -15,9 +15,6 @@ public class MaHouseSet {
    */
   @ApiModelProperty(value="仓库ID")
   private long houseId;
-
-  @ApiModelProperty(value="仓库名称")
-  private String houseName;
   /**
    * 机具类型ID
    */
@@ -258,12 +255,4 @@ public class MaHouseSet {
   public void setMaCode(String maCode) {
     this.maCode = maCode;
   }
-
-  public String getHouseName() {
-    return houseName;
-  }
-
-  public void setHouseName(String houseName) {
-    this.houseName = houseName;
-  }
 }

sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaHouseSetMapper.xml

@@ -91,13 +91,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getHouseSetList" resultType="com.bonus.sgzb.base.domain.MaHouseSet">
         select mt.type_name specificationType, mt1.type_name machineTypeName, mt2.type_name itemType ,
         mm.ma_code maCode, mhs.house_id, mhs.type_id, mhs.ma_id, mhs.num, mhs.status, mhs.dept_id, mhs.del_flag,
-        mhs.create_by, mhs.create_time, mhs.update_by,mhs.update_time,mhs.remark,mhs.company_id,mhi.house_name houseName
+        mhs.create_by, mhs.create_time, mhs.update_by,mhs.update_time,mhs.remark,mhs.company_id
         from ma_machine mm
         left join ma_type mt on mm.type_id = mt.type_id
         left join ma_type mt1 on mt.parent_id = mt1.type_id
         left join ma_type mt2 on mt1.parent_id = mt2.type_id
         left join ma_house_set mhs on mt.type_id = mhs.type_id
-        left join ma_house_info mhi on mhs.house_id = mhi.house_id
         where mt.manage_type = '0' and mt.level = '4'
         <if test="houseId != null and houseId != ''">
             AND mhs.house_id = #{houseId}

sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml

@@ -26,7 +26,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="buyTask"    column="buy_task"    />
         <result property="ownHouse"    column="own_house"    />
         <result property="companyId"    column="company_id"    />
-        <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectMaMachine">
@@ -38,10 +37,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 
     <select id="getMaMachine" parameterType="com.bonus.sgzb.base.api.domain.MaMachine" resultMap="MaMachineResult">
-        select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, dic.name maStatusName, m.qr_code, m.buy_price,
+        select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, dic.name maStatusName, m.qr_code, m.buy_price, m.ma_vender, m.out_fac_time, m.out_fac_code,
-        m.ma_vender, m.out_fac_time, m.out_fac_code, m.assets_code, m.check_man, m.this_check_time, m.next_check_time,
+        m.assets_code, m.check_man, m.this_check_time, m.next_check_time, m.gps_code, m.rfid_code, m.erp_code, m.transfer_code,
-        m.gps_code, m.rfid_code, m.erp_code, m.transfer_code,m.create_time ,m.in_out_num, m.buy_task, m.own_house ,
+        m.in_out_num, m.buy_task, m.own_house ,m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType,
-        m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType,
         mmb.label_code labelCode
         from ma_machine m
         left join (select id,p_id,name from sys_dic where p_id in (select id from sys_dic where value = 'ma_status')) dic on m.ma_status = dic.id
@@ -49,28 +47,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join ma_type mt1 on mt.parent_id = mt1.type_id
         left join ma_type mt2 on mt1.parent_id = mt2.type_id
         left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id
-        left join ma_prop_set mps on mt.type_id = mps.type_id
         <where>
             <if test="maId != null and maId != ''">
                 AND ma_id = #{maId}
             </if>
             <if test="typeId != null and typeId != ''">
-                AND mt.type_id = #{typeId}
+                AND type_id = #{typeId}
-            </if>
-            <if test="deviceId != null and deviceId != ''">
-                AND mt1.type_id = #{deviceId}
-            </if>
-            <if test="itemId != null and itemId != ''">
-                AND mt2.type_id = #{itemId}
-            </if>
-            <if test="propId != null and propId != ''">
-                AND mps.prop_id = #{propId}
-            </if>
-            <if test="keyWord != null and keyWord != ''">
-                AND (m.ma_code like concat('%',#{keyWord},'%') or m.buy_task like concat('%',#{keyWord},'%'))
-            </if>
-            <if test="beginTime != null and endTime != null and beginTime != '' and endTime != null">
-                AND m.create_time between #{beginTime} and #{endTime}
             </if>
         </where>
         order by m.ma_id desc

sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaTypeFileMapper.xml

@@ -79,7 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where type_id = #{typeId} and file_type = #{fileType}
     </update>
 
-    <delete id="deleteMaTypeFileByTypeId">
+    <delete id="deleteMaTypeFileByTypeId" parameterType="Long">
         delete from ma_type_file where type_id = #{typeId} and file_type = #{fileType}
     </delete>
 

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

@@ -5,7 +5,6 @@ import java.util.Date;
 import java.util.List;
 
 import com.bonus.sgzb.base.api.domain.TmTask;
-import com.bonus.sgzb.common.security.utils.SecurityUtils;
 import com.bonus.sgzb.material.domain.BmNoticeInfo;
 import com.bonus.sgzb.material.domain.PurchaseCheckDetails;
 import com.bonus.sgzb.material.domain.PurchaseCheckInfo;
@@ -113,7 +112,6 @@ public class PurchaseCheckInfoServiceImpl implements IPurchaseCheckInfoService
         task.setCode(purchaseCodeRule());
         task.setCreateTime(DateUtils.getNowDate());
         task.setCompanyId(purchaseCheckInfo.getCompanyId());
-        task.setCreateBy(SecurityUtils.getUsername());
         // 创建任务信息
         taskMapper.insertTmTask(task);
         purchaseCheckInfo.setTaskId(task.getTaskId());

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

@@ -96,8 +96,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
         }
         PurchaseCheckDetails purchaseCheckDetails = new PurchaseCheckDetails();
         for (PurchaseMacodeInfo purchaseMacodeInfo : purchaseMacodeInfoList) {
-            Long taskId = purchaseMacodeInfo.getTaskId();
-            TmTask task = taskMapper.selectTmTaskByTaskId(taskId);
             Long typeId = purchaseMacodeInfo.getTypeId();
             String maCode = purchaseMacodeInfo.getMaCode();
             purchaseCheckDetails.setTypeId(typeId);
@@ -111,7 +109,6 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
                 maMachine.setTypeId(typeId);
                 maMachine.setMaStatus("14");
                 maMachine.setQrCode(qrCode);
-                maMachine.setBuyTask(task.getCode());
                 // 设备原厂编号
                 String fixCode = purchaseMacodeInfo.getFixCode();
                 if ("0".equals(fixCode)) {

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

@@ -144,8 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPutInListList" resultMap="PurchaseCheckInfoResult">
         select pci.id,pci.task_id, pci.purchase_time, pci.arrival_time, pci.purchaser, pci.create_by, pci.create_time, pci.update_by,
-        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus,su.user_name purchaserName,
+        pci.update_time, pci.remark, pci.company_id ,dict.name purchasingStatus,tk.code,tk.task_status taskStatus,su.user_name purchaserName
-        tk.create_by
         from purchase_check_info pci
         left join tm_task tk on pci.task_id = tk.task_id
         left join (select id,name from sys_dic where p_id = 50) dict on tk.task_status = dict.id

sgzb-modules/sgzb-system/pom.xml

@@ -102,7 +102,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-scratchpad</artifactId>
-            <version>4.1.2</version>
+            <version>4.1.1</version>
         </dependency>
 
     </dependencies>