Merge remote-tracking branch 'origin/master'

src/main/java/com/dsic/gj_erp/bean/zyjh/YcldwInfo.java

@@ -51,7 +51,7 @@ public class YcldwInfo {
         this.zt=ZtEnum.BF;
     }
 
-    private void paowan(){
+    public void paowan(){
         this.zt=ZtEnum.PW;
     }
 

src/main/java/com/dsic/gj_erp/controller/zyjh/ZyjhController.java

@@ -52,10 +52,16 @@ public class ZyjhController {
                 String date=DateUtil.date().toString("yyyy/MM/dd");
                 for(DmYdjh dmYdjh:list){
                     field.set(dmYdjh,date);
+                    dmYdjh.setJhlx(null);
                     dmYdjh.setZtByZyjhzx(dto.getZxZtName());
                 }
             }
+            if ("PWFK".equals(dto.getZxZtName())){
+                ycldwInfoService.updatePw(dto.getYcldwInfo());
+                wsHandler.sendPwComplete((JSONObject) JSONObject.toJSON(dto.getYcldwInfo()));
+            }
             zyjhService.updateBatchById(list);
+
             return new ResultBean<>();
         } catch (NoSuchFieldException | IllegalAccessException e) {
             e.printStackTrace();

src/main/java/com/dsic/gj_erp/controller/zyjh/dto/PgDto.java

@@ -1,6 +1,7 @@
 package com.dsic.gj_erp.controller.zyjh.dto;
 
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+import com.dsic.gj_erp.bean.zyjh.YcldwInfo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -13,4 +14,6 @@ public class PgDto {
     private String fieldry;
     private String zxZtName;
     private List<DmYdjh> list;
+
+    private YcldwInfo ycldwInfo;
 }

src/main/java/com/dsic/gj_erp/mapper/zyjh/YcldwInfoMapper.java

@@ -6,4 +6,6 @@ import com.dsic.gj_erp.bean.zyjh.YcldwInfo;
 public interface YcldwInfoMapper extends BaseMapper<YcldwInfo> {
 
     void daoduo(Integer id,int y);
+
+    void pwfk(Integer ceng,Integer dwId);
 }

src/main/java/com/dsic/gj_erp/service/zyjh/YcldwInfoService.java

@@ -1,13 +1,13 @@
 package com.dsic.gj_erp.service.zyjh;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.dsic.gj_erp.bean.zyjh.Ycldw;
 import com.dsic.gj_erp.bean.zyjh.YcldwInfo;
 import com.dsic.gj_erp.controller.zyjh.dto.ShangLiao;
 import com.dsic.gj_erp.mapper.zyjh.YcldwInfoMapper;
-import com.dsic.gj_erp.mapper.zyjh.YcldwMapper;
 import org.springframework.stereotype.Service;
 
+import javax.transaction.Transactional;
+
 @Service
 public class YcldwInfoService extends ServiceImpl<YcldwInfoMapper, YcldwInfo> {
 
@@ -20,4 +20,10 @@ public class YcldwInfoService extends ServiceImpl<YcldwInfoMapper, YcldwInfo> {
     public void daoduo(Integer id,int y){
         baseMapper.daoduo(id,y);
     }
+
+    @Transactional(rollbackOn = Exception.class)
+    public void updatePw(YcldwInfo info){
+        this.removeById(info.getId());
+        baseMapper.pwfk(info.getCeng(),info.getDwId());
+    }
 }

src/main/java/com/dsic/gj_erp/ws/WsHandler.java

@@ -41,4 +41,8 @@ public class WsHandler {
     public void sendSlComplete(JSONObject object) {
         socketIOServer.getBroadcastOperations().sendEvent("slComplete", object);
     }
+
+    public void sendPwComplete(JSONObject object) {
+        socketIOServer.getBroadcastOperations().sendEvent("pwComplete", object);
+    }
 }

src/main/resources/mappers/zyjh/YcldwInfoMapper.xml

@@ -5,4 +5,8 @@
     <update id="daoduo">
         update ycldw_info set ceng=ceng+#{y} where id=#{id}
     </update>
+
+    <update id="pwfk">
+        update ycldw_info set ceng=ceng-1 where ceng>#{ceng} and dw_id=#{dwId}
+    </update>
 </mapper>