Browse Source

问题修改

zhs 2 years ago
parent
commit
b13f222788

+ 12 - 0
src/main/java/com/tld/controller/WebPrintController.java

@@ -1,6 +1,7 @@
 package com.tld.controller;
 
 
+import com.tld.model.SupportingCodeSn;
 import com.tld.model.TldPrint;
 import com.tld.service.WebPrintService;
 import lombok.RequiredArgsConstructor;
@@ -40,4 +41,15 @@ public class WebPrintController {
         return webPrintService.addPrint(tldPrint, request);
     }
 
+    /**
+     * 新增托码跟SN绑定关系
+     * @param supportingCodeSn 参数
+     * @param request 用户ID
+     * @return 返回结果
+     */
+    @PostMapping("addSupportingCodeSn")
+    public Map<String, Object> addSupportingCodeSn(@RequestBody SupportingCodeSn supportingCodeSn, HttpServletRequest request){
+        return webPrintService.addSupportingCodeSn(supportingCodeSn, request);
+    }
+
 }

+ 3 - 0
src/main/java/com/tld/mapper/WebPrintMapper.java

@@ -1,5 +1,6 @@
 package com.tld.mapper;
 
+import com.tld.model.SupportingCodeSn;
 import com.tld.model.TldPrint;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -8,4 +9,6 @@ public interface WebPrintMapper {
     int getSerialCount(TldPrint tldPrint);
 
     void addPrint(TldPrint tldPrint);
+
+    void addSupportingCodeSn(SupportingCodeSn supportingCodeSn);
 }

+ 31 - 0
src/main/java/com/tld/model/SupportingCodeSn.java

@@ -0,0 +1,31 @@
+package com.tld.model;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * 托码绑定SN
+ */
+@Data
+@Accessors(chain = true)
+@SuppressWarnings("serial")
+public class SupportingCodeSn implements Serializable {
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 托码
+     */
+    private String supportingCode;
+    /**
+     * sn
+     */
+    private String sn;
+    /**
+     * 用户ID
+     */
+    private String userId;
+}

+ 3 - 0
src/main/java/com/tld/service/WebPrintService.java

@@ -1,5 +1,6 @@
 package com.tld.service;
 
+import com.tld.model.SupportingCodeSn;
 import com.tld.model.TldPrint;
 
 import javax.servlet.http.HttpServletRequest;
@@ -9,4 +10,6 @@ public interface WebPrintService {
     Map<String, Object> getSerial(TldPrint tldPrint, HttpServletRequest request);
 
     Map<String, Object> addPrint(TldPrint tldPrint, HttpServletRequest request);
+
+    Map<String, Object> addSupportingCodeSn(SupportingCodeSn supportingCodeSn, HttpServletRequest request);
 }

+ 1 - 1
src/main/java/com/tld/service/impl/WarehousingServiceImpl.java

@@ -201,7 +201,7 @@ public class WarehousingServiceImpl implements WarehousingService {
                 warehousingVirtual.setPurchaseNum(receiveGoods1.getPurchaseNum());
                 list.add(warehousingVirtual);
                 list1.add(warehousingVirtual);
-                if(Double.parseDouble(warehousingVirtual.getNum()) <= 0){
+                if(Double.doubleToLongBits(Double.parseDouble(warehousingVirtual.getNum())) <= 0){
                     break;
                 }
                 receiveGoods1.setWarehousingNum(warehousingVirtual.getNum());

+ 16 - 0
src/main/java/com/tld/service/impl/WebPrintServiceImpl.java

@@ -3,6 +3,7 @@ package com.tld.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.tld.mapper.WebPrintMapper;
+import com.tld.model.SupportingCodeSn;
 import com.tld.model.TldPrint;
 import com.tld.model.User;
 import com.tld.service.WebPrintService;
@@ -83,6 +84,21 @@ public class WebPrintServiceImpl implements WebPrintService {
         return map;
     }
 
+    @Override
+    public Map<String, Object> addSupportingCodeSn(SupportingCodeSn supportingCodeSn, HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<>();
+        try{
+            supportingCodeSn.setUserId(request.getHeader("userId"));
+            webPrintMapper.addSupportingCodeSn(supportingCodeSn);
+            map.put("msg", "200");
+        } catch (Exception e){
+            e.printStackTrace();
+            map.put("msg", "500");
+            map.put("errMsg", "服务器请求异常,请稍后再试");
+        }
+        return map;
+    }
+
     /**
      * 供应商编号生成
      * @param code 参数

+ 1 - 1
src/main/resources/mapper/AskGoodsMapper.xml

@@ -1758,7 +1758,7 @@
         where id = #{id}
     </update>
     <!-- 查询销售单出库 -->
-    <select id="callDelivery">
+    <select id="callDelivery" resultType="com.tld.model.ReturRemoval">
         select
             removal_code as removalCode,
             ifnull(name, '李兆峰') as name

+ 5 - 0
src/main/resources/mapper/WebPrintMapper.xml

@@ -11,4 +11,9 @@
         insert into tld_print(material_code,supplier_id,produc_date,num,serial,scrq,user_id,type)
         value(#{materialCode},#{supplierId},#{producDate},#{num},#{serial},now(),#{userId},#{type})
     </insert>
+    <!-- 新增信息 -->
+    <insert id="addSupportingCodeSn">
+        insert into tld_supporting_code_sn(supporting_code,sn,user_id,time)
+            value(#{supportingCode},#{sn},#{userId},now())
+    </insert>
 </mapper>