Merge branch 'master' into 'master'

优化追溯码销售退货流程

See merge request lighter/web-server!162

src/main/java/thyyxxk/webserver/dao/his/medicine/YpTracCodgDao.java

@@ -6,8 +6,6 @@ import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 import thyyxxk.webserver.entity.datamodify.YpInDetl;
 import thyyxxk.webserver.entity.datamodify.YpOutDetl;
-import thyyxxk.webserver.entity.medicalinsurance.manage.inventory.InvinfoUpload;
-import thyyxxk.webserver.entity.medicalinsurance.manage.inventory.PurcinfoBought;
 import thyyxxk.webserver.entity.medicalinsurance.manage.inventory.SelinfoSold;
 import thyyxxk.webserver.entity.medicine.YpCodgUpload;
 import thyyxxk.webserver.entity.medicine.YpInvinfoModify;

src/main/java/thyyxxk/webserver/entity/medicine/YpSelinfoSold.java

@@ -2,6 +2,7 @@ package thyyxxk.webserver.entity.medicine;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -333,7 +334,7 @@ public class YpSelinfoSold {
     private Integer realNo;
 
     /**
-     * 1是退药， 0是正常发药
+     * 1是退药或者销售退货删除， 0是正常发药
      */
     private String isTy;
     /**
@@ -341,4 +342,10 @@ public class YpSelinfoSold {
      */
     private String drugTracCodg;
 
+    /**
+     * 0: 药品销售退货上传；1：药品退药退货上传
+     */
+    @TableField(exist = false)
+    private String type;
+
 }

src/main/java/thyyxxk/webserver/service/medicine/YpTracCodgService.java

@@ -611,11 +611,12 @@ public class YpTracCodgService {
         if(null == list || list.isEmpty()){
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有销售退货数量，请检查！");
         }
+        String type = list.get(0).getType();
         List<SelinfoReturn> selinfoS = new ArrayList<>();
         for(YpSelinfoSold yp : list){
             SelinfoReturn pb = new SelinfoReturn();
             yp.setIsTy("1");
-            callYpCodgInfo(yp, "1");
+            callYpCodgInfo(yp, type);
             BeanUtils.copyProperties(yp, pb);
             selinfoS.add(pb);
         }
@@ -642,7 +643,7 @@ public class YpTracCodgService {
             }
             for(YpSelinfoSold in : list){
                 if(in.getFixmedinsBchno().equals(fixmedinsBchno)){
-                    in.setUploadFlag(retRslt);
+                    in.setUploadFlag("-2");
                     in.setMsgErr(m.get("msgRslt") == null ? "" : String.valueOf(m.get("msgRslt")));
                     in.setCreateTime(DateUtil.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
                 }