1.新增入库记录页面导出功能

2.修改查询入库记录接口,新增相关字段
3.新增取消入库接口

sto/src/main/java/com/shinsoft/sto/controller/record/InRecordController.java

@@ -1,5 +1,6 @@
 package com.shinsoft.sto.controller.record;
 
+import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.shinsoft.sto.model.record.ImportModel;
@@ -12,6 +13,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -28,10 +31,7 @@ public class InRecordController {
     private InrecordService inrecordService;
 
     @RequestMapping("/query")
-    public ResultJSON query(@RequestParam(defaultValue = "1") int page,
-                            @RequestParam(defaultValue = "50") int rows,
-                            String params,
-                            HttpServletRequest request) {
+    public ResultJSON query(@RequestParam(defaultValue = "1") int page, @RequestParam(defaultValue = "50") int rows, String params, HttpServletRequest request) {
         try {
             Map<String, Object> map = buildQueryParams(params, request);
             return inrecordService.query(page, rows, map);
@@ -99,6 +99,15 @@ public class InRecordController {
         }
     }
 
+    @RequestMapping("/exportInRecode")
+    public void exportInRecode(HttpServletResponse response,@RequestBody List<ImportModel> list) {
+        try {
+            excelExportTools.exportExcel(response, list, "入库记录", "入库记录", ImportModel.class);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
+    }
+
     /**
      * Excel文件上传
      */
@@ -124,24 +133,6 @@ public class InRecordController {
         }
     }
 
-
-
-
-//    /**
-//     * 单张入库
-//     */
-//    @RequestMapping("/in")
-//    public ResultJSON in( String json, HttpServletRequest request) {
-//        try {
-//            String belongId = resolveBelongId(request);
-//            String userId = resolveUserId(request);
-//            return inrecordService.in(userId, json, belongId);
-//        } catch (Exception ex) {
-//            ex.printStackTrace();
-//            return ResultJSON.error("入库失败：" + ex.getMessage());
-//        }
-//    }
-//
     /**
      * 批量入库
      */
@@ -159,5 +150,21 @@ public class InRecordController {
         }
     }
 
+    /**
+     * 取消入库
+     */
+    @PostMapping("/cancelInStore")
+    public ResultJSON cancelInStore(String params, HttpServletRequest request) {
+        try {
+            String userId = resolveUserId(request);
+            String belongId = resolveBelongId(request);
+            Map<String, Object> map = buildQueryParams(params, request);
+            return inrecordService.cancelInStore(map,userId,belongId);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return ResultJSON.error("取消入库失败：" + ex.getMessage());
+        }
+    }
+
 }
 

sto/src/main/java/com/shinsoft/sto/mapper/record/InrecordMapper.xml

@@ -199,7 +199,12 @@
         material.material_model as material_model,
         prod.ATTRIB_01 as orderNo,
         PROD.ATTRIB_02 as contractNo,
-        PROD.IN_TRUCK_NO as carNo
+        PROD.IN_TRUCK_NO as carNo,
+        PROD.ATTRIB_03 as specification,
+        PROD.ATTRIB_05 as placeOfOrigin,
+        PROD.IN_USER_NAME,
+        PROD.ATTRIB_04 as bundleNumber,
+        PROD.id as prodId
         from T_IN_RECORD ir
         left join T_MAIN_CUSTOMER owner on owner.id = ir.owner_company
         left join T_MAIN_CUSTOMER receiving on receiving.id = ir.receiving_company

sto/src/main/java/com/shinsoft/sto/model/record/ImportModel.java

@@ -83,12 +83,12 @@ public class ImportModel {
     @ColumnWidth(15)
     private String remark1;
 
-    @ExcelProperty(value = "垛位备注", index = 18)
-    @ColumnWidth(15)
-    private String remark2;
+//    @ExcelProperty(value = "垛位备注", index = 18)
+//    @ColumnWidth(15)
+//    private String remark2;
 
-    @ExcelProperty(value = "入库/理货人员", index = 19)
-    @ColumnWidth(15)
+    @ExcelProperty(value = "入库/理货人员", index = 18)
+    @ColumnWidth(20)
     private String inUser;
 //
 }

sto/src/main/java/com/shinsoft/sto/model/record/Inrecord.java

@@ -1,5 +1,6 @@
 package com.shinsoft.sto.model.record;
 
+import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.shinsoft.generator.model.BaseModel;
@@ -30,6 +31,7 @@ public class Inrecord extends BaseModel {
     private String tallyPeople;
 
     @ApiModelProperty("入库时间")
+    @DateTimeFormat(value = "yyyy-MM-dd HH:mm:ss")
     private Date inDtm;
 
     @ApiModelProperty("入库库房名称")
@@ -170,6 +172,21 @@ public class Inrecord extends BaseModel {
 
     @TableField(exist = false)
     private List<String> stGrades;
+
+    @TableField(exist = false)
+    private String specification;
+
+    @TableField(exist = false)
+    private String placeOfOrigin;
+
+    @TableField(exist = false)
+    private String inUserName;
+
+    @TableField(exist = false)
+    private String bundleNumber;
+
+    @TableField(exist = false)
+    private String prodId;
 }
 
 

sto/src/main/java/com/shinsoft/sto/service/impl/record/InrecordServiceImpl.java

@@ -187,6 +187,7 @@ public class InrecordServiceImpl extends ServiceImpl<InrecordMapper, Inrecord> i
         return null;
     }
 
+
     /**
      * 拼接材料信息
      */
@@ -320,5 +321,47 @@ public class InrecordServiceImpl extends ServiceImpl<InrecordMapper, Inrecord> i
         changeRecord.setProdId(prodMaster.getId());
         return changeRecord;
     }
+
+    @Override
+    public ResultJSON cancelInStore(Map<String, Object> map, String userId, String belongId) {
+//        入库记录id
+        Object id = map.get("id");
+//        材料id
+        Object id1 = map.get("prodId");
+//        根据材料id修改材料库中cancel_flag为1
+        ProdMaster prodMaster = new ProdMaster();
+        prodMaster.setCancelFlag("1");
+        prodMasterMapper.update(prodMaster,new QueryWrapper<>(ProdMaster.class)
+                .eq("id",id1.toString())
+                .eq("cancel_flag","0")
+                .eq("belong_id",belongId));
+//        根据材料id删除库存表中数据
+        StoreChange storeChange = new StoreChange();
+        storeChange.setCancelFlag("1");
+        storeChangeMapper.update(storeChange,new QueryWrapper<>(StoreChange.class)
+                .eq("prod_id",id1.toString())
+                .eq("cancel_flag","0")
+                .eq("belong_id",belongId));
+//        根据材料id修改入库表中数据
+        Inrecord inrecord = new Inrecord();
+        inrecord.setCancelFlag("1");
+        inrecordMapper.update(inrecord,new QueryWrapper<>(Inrecord.class)
+                .eq("prod_id",id1.toString())
+                .eq("cancel_flag","0")
+                .eq("belong_id",belongId));
+//        添加操作记录表中数据
+        ChangeRecord changeRecord = new ChangeRecord();
+        changeRecord.setId(UUID.randomUUID().toString().replace("-", ""));
+        changeRecord.setAddId(userId);
+        changeRecord.setAddTime(new Date());
+        changeRecord.setBelongId(belongId);
+        changeRecord.setChangeFlag("02");
+        changeRecord.setChangeNote("取消入库");
+        changeRecord.setCancelFlag("0");
+        changeRecord.setCntNum(1);
+        changeRecord.setProdId(id1.toString());
+        changeRecordMapper.insert(changeRecord);
+        return ResultJSON.success();
+    }
 }
 

sto/src/main/java/com/shinsoft/sto/service/record/InrecordService.java

@@ -16,5 +16,7 @@ public interface InrecordService {
 
 
     ResultJSON batchInStore(String userId, List<ImportModel> dataList, String belongId,String userName);
+
+    ResultJSON cancelInStore(Map<String,Object> map,String userId,String belongId);
 }