产品管理排序字段bug修复

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java

@@ -75,12 +75,15 @@ public class ProduceServiceImpl implements ProduceService {
     //添加产品
     @Transactional
     public Integer saveProduce(Produce produce){
-        produce.setProduceNo(ProduceNoUtil.getProduceNo(produceMapper));
-        produce.setProduceStatus(1);
+        if(0 == produce.getProduceStatus()){
+            produce.setProduceNo(ProduceNoUtil.NO_NUMBER);
+        }else{
+            produce.setProduceNo(ProduceNoUtil.getProduceNo(produceMapper));
+        }
         int flag = produceMapper.saveProduce(produce);
         Integer produceId = produce.getProduceId(); // 获取产品主键
 
-        int sort = 0;   //专用排序字段
+        int sort = 1;   //专用排序字段
         for (int i=0; i<produce.getProcess().size();i++){
             produce.getProcess().get(i).setProduceId(produceId);    //产品id
             produce.getProcess().get(i).setProcessNo(ProduceNoUtil.getProcessNo(i));  //工序编号
@@ -127,6 +130,11 @@ public class ProduceServiceImpl implements ProduceService {
      */
     @Transactional
     public Integer updateProduce(Produce produce,String delProcessIds,String delNodeIds){
+        if(0 == produce.getProduceStatus()){
+            produce.setProduceNo(ProduceNoUtil.NO_NUMBER);
+        }else{
+            produce.setProduceNo(ProduceNoUtil.getProduceNo(produceMapper));
+        }
         //修改产品
         int flag = produceMapper.updateProduce(produce);
 
@@ -143,7 +151,7 @@ public class ProduceServiceImpl implements ProduceService {
 
         Integer produceId = produce.getProduceId();
 
-        int sort = 0;   //专用排序字段
+        int sort = 1;   //专用排序字段
 
         List<ProduceProcess> updateProcessList = new ArrayList<ProduceProcess>();
         List<ProcessNode> updateNodeList = new ArrayList<ProcessNode>();

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/PtsEmployeeServiceImpl.java

@@ -69,7 +69,7 @@ public class PtsEmployeeServiceImpl implements PtsEmployeeService {
      * @param employeeNo
      * @return
      */
-    public PtsEmployee getEmployeeByEmployeeNo(String employeeNo){
+    public  PtsEmployee getEmployeeByEmployeeNo(String employeeNo){
         return ptsEmployeeMapper.getEmployeeByEmployeeNo(employeeNo);
     }
 }

watero-rst-service/src/main/java/com/iamberry/rst/util/ProduceNoUtil.java

@@ -19,7 +19,10 @@ public class ProduceNoUtil {
             "a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z"};
 
     //已删除的产品，工序的编号为#
-    private final static  String NO_NUMBER = "#";
+    public final static  String NO_NUMBER = "#";
+
+    private ProduceNoUtil() {
+    }
 
     /**
      * 获取产品编号