更新排序

mes/src/main/java/com/ximai/mes/md/service/impl/MdWorkunitServiceImpl.java

@@ -48,6 +48,8 @@ public class MdWorkunitServiceImpl implements IMdWorkunitService {
     @Resource
     private MdWorkstationMapper mdWorkstationMapper;
 
+    @Autowired
+    private MdWorkstation mdWorkstation;
     /**
      * 查询工作单元
      *
@@ -89,6 +91,11 @@ public class MdWorkunitServiceImpl implements IMdWorkunitService {
     @Override
     public int insertMdWorkunit(MdWorkunit mdWorkunit) {
         mdWorkunit.createAction();
+        if(mdWorkunit.getWorkstationId() != null){
+            MdWorkstation mdWorkstation = mdWorkstationMapper.selectMdWorkstationByWorkstationId(mdWorkunit.getWorkstationId());
+            if(mdWorkstation != null)
+                mdWorkunit.setWorkstationCode(mdWorkstation.getWorkstationCode());
+        }
         return mdWorkunitMapper.insertMdWorkunit(mdWorkunit);
     }
 

mes/src/main/resources/mapper/pro/productionSolution/ProProductionSolutionProcessMapper.xml

@@ -108,6 +108,7 @@
             <if test="workstationId != null ">and ppsp.workstation_id = #{workstationId}</if>
             <if test="processId != null ">and ppsp.process_id = #{processId}</if>
         </where>
+        order by ppsp.serial
     </select>
 
     <select id="selectProProductionSolutionProcessByProductionSolutionProcessId" parameterType="Long"