Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldController.java

@@ -43,7 +43,6 @@ public class MouldController {
      * 添加参数：equipmentId 设备id， modelNo 模具编号 ,modelName 模具名称 ,maintainCount 保养设定次数："1,2,3"
      * 修改参数：id 模具id, settingLife 使用年限， initialModulus 初始模次 equipmentId 设备id，
      * produceCompanyId 生产方公司id,ocCycle 每模平均周期,rfid rfid码，maintainCount 保养设定次数："1,2,3"
-     * produceCompanyName 生产方公司的名称
      *
      * 模具更新时多传的参数  preUpdateId 要被更新的模具的id
      * @return

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldServiceImpl.java

@@ -73,6 +73,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             if ((m != null && m.getId() == mould.getId()) || m == null) {
                 if (mould.getProduceCompanyId() != null) {
                     Company company = companyMapper.selectById(mould.getProduceCompanyId());
+                    mould.setProduceCompanyName(company.getCompanyName());
                     mould.setArea(company.getCompanyAddress());
                 }
                 mouldMapper.updateById(mould);
@@ -84,6 +85,9 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 //更新模具操作
                 //取出之前模具的信息
                 Mould model = mouldMapper.selectById(mould.getPreUpdateId());
+                model.setProjectId(null);
+                model.setEquipmentId(null);
+                mouldMapper.updateById(model);
                 //查询当前模具编号的模具是否存在
                 Integer count = mouldMapper.selectCount(new QueryWrapper<Mould>().eq("model_no", mould.getModelNo()));
                 if (count > 0) {
@@ -92,15 +96,18 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 } else {
                     if (mould.getProduceCompanyId() != null) {
                         Company company = companyMapper.selectById(mould.getProduceCompanyId());
+                        mould.setProduceCompanyName(company.getCompanyName());
                         mould.setArea(company.getCompanyAddress());
                     }
                     mould.setCreatorId(user.getId());
                     mould.setCompanyId(user.getCompanyId());
                     mould.setEquipmentId(model.getEquipmentId());
                     mould.setProjectId(model.getProjectId());
+                    mould.setRunTimes(model.getRunTimes());
                     mouldMapper.insert(mould);
                 }
                 }else{
+                    //普通创建模具
                     //查询当前模具编号的模具是否存在
                     Integer count = mouldMapper.selectCount(new QueryWrapper<Mould>().eq("model_no", mould.getModelNo()));
                     if (count > 0) {

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -182,7 +182,7 @@
     <select id="selectListByCompanyId" resultMap="BaseResultMapVO">
 select
         tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,tbm.creator_id creator_id,tbm.equipment_id equipment_id,tbm.is_maintain,tbm.holes,
-        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbm.pre_update_id,tbm.company_id,
+        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbm.pre_update_id,tbm.company_id,tbco.company_name produceCompany,tbm.produce_company_id,
         tbp.manager mangerName,tbm.area area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbp.manager_id managerId,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times
         from
@@ -198,6 +198,10 @@ select
         tb_company tbc
         on
         tbc.id = tbm.company_id
+        left join
+        tb_company tbco
+        on
+        tbco.id = tbm.produce_company_id
         where
           tbm.company_id = #{companyId}
     </select>