维护仓库管理系统

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/controller/IostDeliverstatusController.java

 package org.jeecg.modules.iost.basedata.controller;
 
-import java.io.UnsupportedEncodingException;
 import java.io.IOException;
-import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -12,6 +10,8 @@ import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.jeecg.modules.iost.basedata.service.IIostDeliveryRecordPageService;
+import org.jeecg.modules.iost.basedata.vo.IostDeliveryRecordPage;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -37,7 +37,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -57,6 +56,8 @@ public class IostDeliverstatusController {
 	private IIostDeliverstatusService iostDeliverstatusService;
 	@Autowired
 	private IIostDeliverstatusListService iostDeliverstatusListService;
+	@Autowired
+	private IIostDeliveryRecordPageService iostDeliveryRecordPageService;
 	
 	/**
 	 * 分页列表查询
@@ -163,6 +164,26 @@ public class IostDeliverstatusController {
 	}
 
 	 /**
+	  * 查询列表
+	  *
+	  * @param
+	  * @return
+	  */
+	 @AutoLog(value = "更新物流状态-查询列表")
+	 @ApiOperation(value="更新物流状态-查询列表", notes="更新物流状态-查询列表")
+	 @GetMapping(value = "/selectlist")
+	 public Result<?> selectlist(IostDeliveryRecordPage iostDeliveryRecordPage,
+								 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								 HttpServletRequest req) {
+		 List<IostDeliveryRecordPage> list = iostDeliveryRecordPageService.selectlist(iostDeliveryRecordPage,pageNo,pageSize);
+		 IPage<IostDeliveryRecordPage> list2 = new Page<>();
+		 list2.setRecords(list);
+		 return Result.OK(list2);
+
+	 }
+
+	/**
 	 * 通过id查询
 	 *
 	 * @param id

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/controller/IostReceivingController.java

@@ -221,7 +221,7 @@ public class IostReceivingController {
 	/**
 	 *  编辑
 	 *
-	 * @param iostReceivingPage
+	 * @param packageMaterialsPage
 	 * @return
 	 */
 	@AutoLog(value = "入仓单-获取组装相关信息")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/controller/IostReceivingNoteController.java

@@ -95,7 +95,6 @@ public class IostReceivingNoteController {
 		IPage<IostReceivingNote> pageList = iostReceivingNoteService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
 	/**
 	 *   添加
 	 *

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/entity/IostInventoryRecord.java

@@ -56,5 +56,5 @@ public class IostInventoryRecord implements Serializable {
 	/**总件数*/
 	@Excel(name = "总件数", width = 15)
     @ApiModelProperty(value = "总件数")
-    private java.lang.Integer packagesTotal;
+    private java.lang.Integer CasesTotal;
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/entity/IostSummarySheetList.java

@@ -79,6 +79,19 @@ public class IostSummarySheetList implements Serializable {
 	@Excel(name = "送货状态", width = 15, dicCode = "delivery_status")
 	@ApiModelProperty(value = "送货状态")
 	private java.lang.String deliverStatus;
+
+	public void setDeliverStatus(String deliverStatus) {
+		this.deliverStatus=deliverStatus;
+		switch (deliverStatus){
+			case "1":
+				this.deliverStatus = "待送货";
+				break;
+			case "2":
+				this.deliverStatus = "已送货";
+				break;
+		}
+	}
+
 	/**汇总单id*/
 	@ApiModelProperty(value = "汇总单id")
 	private java.lang.String summaryId;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/IostCustomerlistMapper.java

@@ -16,4 +16,6 @@ public interface IostCustomerlistMapper extends BaseMapper<IostCustomerlist> {
 	public boolean deleteByMainId(@Param("mainId") String mainId);
     
 	public List<IostCustomerlist> selectByMainId(@Param("mainId") String mainId);
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/IostDeliveryRecordPageMapper.java

+package org.jeecg.modules.iost.basedata.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.iost.basedata.vo.IostDeliverstatusPage;
+import org.jeecg.modules.iost.basedata.vo.IostDeliveryRecordPage;
+import org.jeecg.modules.iost.basedata.vo.IostInventoryRecordPage;
+
+import java.util.List;
+
+/**
+ * @Description: 更新物流状态
+ * @Author: jeecg-boot
+ * @Date:   2021-6-17
+ * @Version: V1.0
+ */
+public interface IostDeliveryRecordPageMapper extends BaseMapper<IostDeliveryRecordPage> {
+    public List<IostDeliveryRecordPage> selectlist(@Param("iostDeliveryRecordPage") IostDeliveryRecordPage iostDeliveryRecordPage,@Param("pageNo") Integer pageNo,@Param("pageSize") Integer pageSize);
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/mapper/xml/IostDeliveryRecordPageMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.iost.basedata.mapper.IostDeliveryRecordPageMapper">
+
+    <select id="selectlist" resultType="org.jeecg.modules.iost.basedata.vo.IostDeliveryRecordPage">
+        SELECT *
+        FROM  iost_deliverstatus AS D,iost_deliverstatus_list AS L
+        <where>
+            <if test="iostDeliveryRecordPage.bulkNo !=null">
+            and bulk_no = iostDeliveryRecordPage.bulkNo
+            </if>
+            <if test="iostDeliveryRecordPage.containerNo !=null">
+                and container_no = iostDeliveryRecordPage.bulkNo
+            </if>
+            and D.id = L.deliverstatus_id
+        </where>
+        limit #{pageNo},#{pageSize}
+    </select>
+
+</mapper>
\ No newline at end of file

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/IIostDeliveryRecordPageService.java

+package org.jeecg.modules.iost.basedata.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.iost.basedata.vo.IostDeliverstatusPage;
+import org.jeecg.modules.iost.basedata.vo.IostDeliveryRecordPage;
+import org.jeecg.modules.iost.basedata.vo.IostInventoryRecordPage;
+
+import java.util.List;
+
+/**
+ * @Description: 更新物流状态
+ * @Author: jeecg-boot
+ * @Date:   2020-11-16
+ * @Version: V1.0
+ */
+public interface IIostDeliveryRecordPageService extends IService<IostDeliveryRecordPage> {
+
+    public List<IostDeliveryRecordPage> selectlist(IostDeliveryRecordPage iostDeliveryRecordPage,Integer pageNo,Integer pageSize);
+
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/service/impl/IostDeliveryRecordPageImpl.java

+package org.jeecg.modules.iost.basedata.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.iost.basedata.mapper.IostDeliveryRecordPageMapper;
+import org.jeecg.modules.iost.basedata.service.IIostDeliveryRecordPageService;
+import org.jeecg.modules.iost.basedata.vo.IostDeliveryRecordPage;
+import org.jeecg.modules.iost.basedata.vo.IostInventoryRecordPage;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @Description: 更新物流状态
+ * @Author: jeecg-boot
+ * @Date:   2020-11-16
+ * @Version: V1.0
+ */
+@Service
+public class IostDeliveryRecordPageImpl extends ServiceImpl<IostDeliveryRecordPageMapper, IostDeliveryRecordPage> implements IIostDeliveryRecordPageService {
+
+    @Autowired
+    private IostDeliveryRecordPageMapper iostDeliveryRecordPageMapper;
+
+    @Override
+    public List<IostDeliveryRecordPage> selectlist(IostDeliveryRecordPage iostDeliveryRecordPage,Integer pageNo,Integer pageSize) {
+        return iostDeliveryRecordPageMapper.selectlist(iostDeliveryRecordPage,pageNo,pageSize);
+    }
+}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/vo/IostDeliveryRecordPage.java

@@ -90,4 +90,15 @@ public class IostDeliveryRecordPage {
 	@ApiModelProperty(value = "出库记录表")
 	private List<IostDeliveryRecordList> iostDeliveryRecordListList;
 
+	/**地点*/
+	@Excel(name = "地点", width = 15)
+	@ApiModelProperty(value = "地点")
+	private java.lang.String location;
+	/**日期*/
+	@Excel(name = "日期", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@ApiModelProperty(value = "日期")
+	private java.util.Date date;
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/basedata/vo/IostInventoryRecordPage.java

@@ -60,4 +60,5 @@ public class IostInventoryRecordPage {
 	@ApiModelProperty(value = "库存记录表")
 	private List<IostInventoryRecordList> iostInventoryRecordListList;
 
+
 }