仓库后续流程优化和库存管理相关代码

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/InventoryInfo.java

@@ -0,0 +1,84 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 工厂-库存表
+ * Created by Administrator on 2018/8/14.
+ */
+public class InventoryInfo implements Serializable{
+    private static final long serialVersionUID = 4067885659182190574L;
+    private Integer inventoryId;
+    private String inventoryProductName;//产品名称
+    private String inventoryProductBar;//产品sku
+    private Integer inventoryRemainingNum;//库存剩余数量
+    private Integer inventoryState;//1.正在使用 2.暂停使用
+    private String inventoryDesc;//备注
+    private Date inventoryCreateTime;//创建时间
+    private Date inventoryUpdateTime;//修改时间
+
+    public Integer getInventoryId() {
+        return inventoryId;
+    }
+
+    public void setInventoryId(Integer inventoryId) {
+        this.inventoryId = inventoryId;
+    }
+
+    public String getInventoryProductName() {
+        return inventoryProductName;
+    }
+
+    public void setInventoryProductName(String inventoryProductName) {
+        this.inventoryProductName = inventoryProductName;
+    }
+
+    public String getInventoryProductBar() {
+        return inventoryProductBar;
+    }
+
+    public void setInventoryProductBar(String inventoryProductBar) {
+        this.inventoryProductBar = inventoryProductBar;
+    }
+
+    public Integer getInventoryRemainingNum() {
+        return inventoryRemainingNum;
+    }
+
+    public void setInventoryRemainingNum(Integer inventoryRemainingNum) {
+        this.inventoryRemainingNum = inventoryRemainingNum;
+    }
+
+    public Integer getInventoryState() {
+        return inventoryState;
+    }
+
+    public void setInventoryState(Integer inventoryState) {
+        this.inventoryState = inventoryState;
+    }
+
+    public String getInventoryDesc() {
+        return inventoryDesc;
+    }
+
+    public void setInventoryDesc(String inventoryDesc) {
+        this.inventoryDesc = inventoryDesc;
+    }
+
+    public Date getInventoryCreateTime() {
+        return inventoryCreateTime;
+    }
+
+    public void setInventoryCreateTime(Date inventoryCreateTime) {
+        this.inventoryCreateTime = inventoryCreateTime;
+    }
+
+    public Date getInventoryUpdateTime() {
+        return inventoryUpdateTime;
+    }
+
+    public void setInventoryUpdateTime(Date inventoryUpdateTime) {
+        this.inventoryUpdateTime = inventoryUpdateTime;
+    }
+}

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/InventoryLog.java

@@ -0,0 +1,112 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 工厂-库存日志表
+ * Created by Administrator on 2018/8/14.
+ */
+public class InventoryLog implements Serializable {
+    private static final long serialVersionUID = 4726786119194494939L;
+    private Integer logId;//
+    private String logProductName;//产品名称
+    private String logProductBar;//产品sku
+    private Integer logWarehouseId;//仓库id
+    private Integer logRemainingNum;//变动数量
+    private Integer logType;//类型1.采购 2.发货 3.次品
+    private Integer logOperationType;//操作类型 增加/减少
+    private String logDesc;//备注
+    private Date logCreateTime;//创建时间
+    private Date logUpdateTime;//修改时间
+
+    private String logWarehouseName;//仓库名称
+
+    public Integer getLogId() {
+        return logId;
+    }
+
+    public void setLogId(Integer logId) {
+        this.logId = logId;
+    }
+
+    public String getLogProductName() {
+        return logProductName;
+    }
+
+    public void setLogProductName(String logProductName) {
+        this.logProductName = logProductName;
+    }
+
+    public String getLogProductBar() {
+        return logProductBar;
+    }
+
+    public void setLogProductBar(String logProductBar) {
+        this.logProductBar = logProductBar;
+    }
+
+    public Integer getLogWarehouseId() {
+        return logWarehouseId;
+    }
+
+    public void setLogWarehouseId(Integer logWarehouseId) {
+        this.logWarehouseId = logWarehouseId;
+    }
+
+    public Integer getLogRemainingNum() {
+        return logRemainingNum;
+    }
+
+    public void setLogRemainingNum(Integer logRemainingNum) {
+        this.logRemainingNum = logRemainingNum;
+    }
+
+    public Integer getLogType() {
+        return logType;
+    }
+
+    public void setLogType(Integer logType) {
+        this.logType = logType;
+    }
+
+    public Integer getLogOperationType() {
+        return logOperationType;
+    }
+
+    public void setLogOperationType(Integer logOperationType) {
+        this.logOperationType = logOperationType;
+    }
+
+    public String getLogDesc() {
+        return logDesc;
+    }
+
+    public void setLogDesc(String logDesc) {
+        this.logDesc = logDesc;
+    }
+
+    public Date getLogCreateTime() {
+        return logCreateTime;
+    }
+
+    public void setLogCreateTime(Date logCreateTime) {
+        this.logCreateTime = logCreateTime;
+    }
+
+    public Date getLogUpdateTime() {
+        return logUpdateTime;
+    }
+
+    public void setLogUpdateTime(Date logUpdateTime) {
+        this.logUpdateTime = logUpdateTime;
+    }
+
+    public String getLogWarehouseName() {
+        return logWarehouseName;
+    }
+
+    public void setLogWarehouseName(String logWarehouseName) {
+        this.logWarehouseName = logWarehouseName;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/InventoryLogService.java

@@ -0,0 +1,48 @@
+package com.iamberry.rst.faces.cm;
+
+import com.iamberry.rst.core.cm.FactoryInfo;
+import com.iamberry.rst.core.cm.InventoryLog;
+import com.iamberry.rst.core.cm.WarehouseInfo;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/8/15.
+ */
+public interface InventoryLogService {
+    /**
+     * 查询单个日志
+     * @param logId
+     * @return
+     */
+    InventoryLog getByInventoryLogId(Integer logId);
+
+    /**
+     * 查询日志列表
+     * @param
+     * @return
+     */
+    PagedResult<InventoryLog> listByInventoryLogId(PageRequest<InventoryLog> pageRequest);
+
+    /**
+     * 修改库存日志
+     * @param inventoryLog
+     * @return
+     */
+    Integer updateById(InventoryLog inventoryLog);
+
+    /**
+     * 增加库存日志
+     * @param inventoryLog
+     * @return
+     */
+    Integer insert(InventoryLog inventoryLog);
+
+    /**
+     * 查询仓库集合
+     * @return
+     */
+    List<WarehouseInfo> listFactoryInfo();
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/InventoryService.java

@@ -0,0 +1,26 @@
+package com.iamberry.rst.faces.cm;
+import com.iamberry.rst.core.cm.InventoryInfo;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/8/15.
+ */
+public interface InventoryService {
+    /**
+     * 获取单个库存信息
+     * @param inventoryId
+     * @return
+     */
+    InventoryInfo getByInventoryId(Integer inventoryId);
+    /**
+     * 获取库存信息列表
+     */
+    PagedResult<InventoryInfo> listByInventoryId(PageRequest<InventoryInfo> pageRequest);
+    /**
+     * 获取库存信息列表
+     */
+    Integer updateById(InventoryInfo inventoryInfo);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/InventoryLogServiceImpl.java

@@ -0,0 +1,53 @@
+package com.iamberry.rst.service.cm;
+
+import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.cm.ComplaintSignclosedInfo;
+import com.iamberry.rst.core.cm.FactoryInfo;
+import com.iamberry.rst.core.cm.InventoryLog;
+import com.iamberry.rst.core.cm.WarehouseInfo;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.faces.cm.InventoryLogService;
+import com.iamberry.rst.service.cm.mapper.InventoryLogMapper;
+import com.iamberry.rst.util.PageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/8/15.
+ */
+@Service
+public class InventoryLogServiceImpl implements InventoryLogService {
+    @Autowired
+    private InventoryLogMapper inventoryLogMapper;
+
+    @Override
+    public InventoryLog getByInventoryLogId(Integer logId) {
+        return inventoryLogMapper.getByInventoryLogId(logId);
+    }
+
+    @Override
+    public PagedResult<InventoryLog> listByInventoryLogId(PageRequest<InventoryLog> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<InventoryLog> inventoryLogList = inventoryLogMapper.listByInventoryLogId(pageRequest.getData());
+        return PageUtil.getPage(inventoryLogList);
+
+    }
+
+    @Override
+    public Integer updateById(InventoryLog inventoryLog) {
+        return inventoryLogMapper.updateById(inventoryLog);
+    }
+
+    @Override
+    public Integer insert(InventoryLog inventoryLog) {
+        return inventoryLogMapper.insert(inventoryLog);
+    }
+
+    @Override
+    public List<WarehouseInfo> listFactoryInfo() {
+        return inventoryLogMapper.listFactoryInfo();
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/InventoryServiceImpl.java

@@ -0,0 +1,42 @@
+package com.iamberry.rst.service.cm;
+
+
+import com.github.pagehelper.PageHelper;
+import com.iamberry.rst.core.cm.InventoryInfo;
+import com.iamberry.rst.core.cm.InventoryLog;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.faces.cm.InventoryService;
+import com.iamberry.rst.service.cm.mapper.InventoryMapper;
+import com.iamberry.rst.util.PageUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/8/15.
+ */
+@Service
+public class InventoryServiceImpl implements InventoryService {
+    @Autowired
+    private InventoryMapper inventoryMapper;
+
+    @Override
+    public InventoryInfo getByInventoryId(Integer inventoryId) {
+        return inventoryMapper.getByInventoryId(inventoryId);
+    }
+
+    @Override
+    public PagedResult<InventoryInfo> listByInventoryId(PageRequest<InventoryInfo> pageRequest) {
+        PageHelper.startPage(pageRequest.getPageNO(), pageRequest.getPageSize(), pageRequest.isPageTotal());
+        List<InventoryInfo> inventoryList = inventoryMapper.listByInventoryId(pageRequest.getData());
+        return PageUtil.getPage(inventoryList);
+
+    }
+
+    @Override
+    public Integer updateById(InventoryInfo inventoryInfo) {
+        return inventoryMapper.updateById(inventoryInfo);
+    }
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/InventoryLogMapper.java

@@ -0,0 +1,45 @@
+package com.iamberry.rst.service.cm.mapper;
+
+import com.iamberry.rst.core.cm.InventoryLog;
+import com.iamberry.rst.core.cm.WarehouseInfo;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/8/14.
+ */
+public interface InventoryLogMapper {
+    /**
+     * 查询单个日志
+     * @param logId
+     * @return
+     */
+    InventoryLog getByInventoryLogId(Integer logId);
+
+    /**
+     * 查询日志列表
+     * @param inventoryLog
+     * @return
+     */
+    List<InventoryLog> listByInventoryLogId(InventoryLog inventoryLog);
+
+    /**
+     * 修改库存日志
+     * @param inventoryLog
+     * @return
+     */
+    Integer updateById(InventoryLog inventoryLog);
+
+    /**
+     * 增加库存日志
+     * @param inventoryLog
+     * @return
+     */
+    Integer insert(InventoryLog inventoryLog);
+
+    /**
+     * 查询仓库集合
+     * @return
+     */
+    List<WarehouseInfo> listFactoryInfo();
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/InventoryMapper.java

@@ -0,0 +1,25 @@
+package com.iamberry.rst.service.cm.mapper;
+
+import com.iamberry.rst.core.cm.InventoryInfo;
+
+import java.util.List;
+
+/**
+ * Created by Administrator on 2018/8/14.
+ */
+public interface InventoryMapper {
+    /**
+     * 获取单个库存信息
+     * @param inventoryId
+     * @return
+     */
+    InventoryInfo getByInventoryId(Integer inventoryId);
+    /**
+     * 获取库存信息列表
+     */
+    List<InventoryInfo> listByInventoryId(InventoryInfo inventoryInfo);
+    /**
+     * 获取库存信息列表
+     */
+    Integer updateById(InventoryInfo inventoryInfo);
+}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/complaintDetectInfoMapper.xml

@@ -79,7 +79,7 @@
         AND pt.type_id = #{productTypeId,jdbcType=INTEGER}
       </if>
       <if test="customerId != null" >
-        AND cd.customer_id like CONCAT('%',#{customerId},'%')
+        AND cd.customer_id = #{customerId}
       </if>
       <if test="productId != null" >
         AND cd.product_id = #{productId}

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/complaintSignclosedInfoMapper.xml

@@ -138,7 +138,7 @@
         AND cs.signclosed_type = #{signclosedType}
       </if>
       <if test="signclosedCustomerId != null " >
-        AND cs.signclosed_customer_id like CONCAT('%',#{signclosedCustomerId},'%')
+        AND cs.signclosed_customer_id = #{signclosedCustomerId}
       </if>
       <if test="isBinding != null and isBinding == 1" >
         AND cs.signclosed_customer_id is NULL

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/inventoryLogMapper.xml

@@ -0,0 +1,138 @@
+<?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="com.iamberry.rst.service.cm.mapper.InventoryLogMapper" >
+  <resultMap id="BaseResultMap" type="InventoryLog" >
+    <id column="log_id" property="logId" jdbcType="INTEGER" />
+    <result column="log_product_name" property="logProductName" jdbcType="VARCHAR" />
+    <result column="log_product_bar" property="logProductBar" jdbcType="VARCHAR" />
+    <result column="log_warehouse_id" property="logWarehouseId" jdbcType="INTEGER" />
+    <result column="log_remaining_num" property="logRemainingNum" jdbcType="INTEGER" />
+    <result column="log_type" property="logType" jdbcType="INTEGER" />
+    <result column="log_operation_type" property="logOperationType" jdbcType="INTEGER" />
+    <result column="log_desc" property="logDesc" jdbcType="VARCHAR" />
+    <result column="log_create_time" property="logCreateTime" jdbcType="TIMESTAMP" />
+    <result column="log_update_time" property="logUpdateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    logId,
+    logProductName,
+    logProductBar,
+    logSarehouseId,
+    logRemainingNum,
+    logType,
+    logOperationType,
+    logDesc,
+    logCreateTime,
+    logUpdateTime
+  </sql>
+  <select id="getByInventoryLogId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tb_rst_fm_inventory_log
+    where log_id = #{logId,jdbcType=INTEGER}
+  </select>
+  <select id="listByInventoryLogId" resultMap="BaseResultMap" parameterType="InventoryLog" >
+    select
+    log_id as logId,
+    log_product_name as logProductName,
+    log_product_bar as logProductBar,
+    log_warehouse_id as logWarehouseId,
+    log_remaining_num as logRemainingNum,
+    log_type as logType,
+    log_operation_type as logOperationType,
+    log_desc as logDesc,
+    log_create_time as logCreateTime,
+    log_update_time as logUpdateTime,
+    warehouse_name as logWarehouseName
+    from
+    tb_rst_fm_inventory_log il
+    LEFT JOIN tb_rst_warehouse_info wi
+    on il.log_warehouse_id = wi.warehouse_id
+    <where>
+      <if test="logId != null and logId != ''">
+        il.log_id = #{logId}
+      </if>
+      <if test="logProductName != null and logProductName != ''">
+        and il.log_product_name like CONCAT('%',#{logProductName},'%')
+      </if>
+      <if test="logProductBar != null and logProductBar != ''">
+        and il.log_product_bar = #{logProductBar}
+      </if>
+      <if test="logWarehouseId != null and logWarehouseId != ''">
+        and il.log_warehouse_id = #{logWarehouseId}
+      </if>
+      <if test="logType != null and logType != ''">
+        and il.log_type = #{logType}
+      </if>
+      <if test="logOperationType != null and logOperationType != ''">
+        and il.log_operation_type = #{logOperationType}
+      </if>
+      <if test="logWarehouseId != null and logWarehouseId != ''">
+        and il.log_warehouse_id = #{logWarehouseId}
+      </if>
+    </where>
+  </select>
+
+  <update id="updateById" parameterType="InventoryLog" >
+    update tb_rst_fm_inventory_log
+    <set >
+      <if test="logProductName != null and logProductName != ''" >
+        log_product_name = #{logProductName,jdbcType=VARCHAR},
+      </if>
+      <if test="logProductBar != null and logProductBar != ''" >
+        log_product_bar = #{logProductBar,jdbcType=VARCHAR},
+      </if>
+      <if test="logWarehouseId != null and logWarehouseId != ''" >
+        log_warehouse_id = #{logWarehouseId},
+      </if>
+      <if test="logRemainingNum != null and logRemainingNum != ''" >
+        log_remaining_num = #{logRemainingNum,jdbcType=INTEGER},
+      </if>
+      <if test="logType != null and logType != ''" >
+        log_type = #{logType,jdbcType=INTEGER},
+      </if>
+      <if test="logOperationType != null and logOperationType != ''" >
+        log_operation_type = #{logOperationType,jdbcType=INTEGER},
+      </if>
+      <if test="logDesc != null and logDesc != ''" >
+        log_desc = #{logDesc,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where logId = #{logId,jdbcType=INTEGER}
+  </update>
+
+  <insert id="insert" parameterType="ComplaintDetectInfo"  useGeneratedKeys="true" keyProperty="detectId" >
+    insert into tb_rst_fm_inventory_log (
+    log_product_name,
+    log_product_bar,
+    log_warehouse_id,
+    log_remaining_num,
+    log_type,
+    log_operation_type,
+    log_desc,
+    log_create_time,
+    log_update_time
+    )
+    values (
+    #{logProductName,jdbcType=VARCHAR},
+    #{logProductBar,jdbcType=VARCHAR},
+    #{logWarehouseId,jdbcType=INTEGER},
+    #{logRemainingNum,jdbcType=INTEGER},
+    #{logType,jdbcType=INTEGER},
+    #{logOperationType,jdbcType=INTEGER},
+    #{logDesc,jdbcType=VARCHAR},
+    #{logCreateTime,jdbcType=TIMESTAMP},
+    #{logUpdateTime,jdbcType=TIMESTAMP}
+    )
+  </insert>
+
+  <select id="listWarehouseInfo" resultType="WarehouseInfo" >
+    select
+      warehouse_id as warehouseId,
+      factory_id as factoryId,
+      warehouse_name as warehouseName,
+      warehouse_desc as warehouseDesc,
+      warehouse_create_date as warehouseCreateDate
+    from tb_rst_warehouse_info
+  </select>
+</mapper>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/inventoryMapper.xml

@@ -0,0 +1,79 @@
+<?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="com.iamberry.rst.service.cm.mapper.InventoryMapper" >
+  <resultMap id="BaseResultMap" type="InventoryInfo" >
+    <id column="inventory_id" property="inventoryId" jdbcType="INTEGER" />
+    <result column="inventory_product_name" property="inventoryProductName" jdbcType="VARCHAR" />
+    <result column="inventory_product_bar" property="inventoryProductBar" jdbcType="VARCHAR" />
+    <result column="inventory_remaining_num" property="inventoryRemainingNum" jdbcType="INTEGER" />
+    <result column="inventory_state" property="inventoryState" jdbcType="INTEGER" />
+    <result column="inventory_desc" property="inventoryDesc" jdbcType="VARCHAR" />
+    <result column="inventory_create_time" property="inventoryCreateTime" jdbcType="TIMESTAMP" />
+    <result column="inventory_update_time" property="inventoryUpdateTime" jdbcType="TIMESTAMP" />
+  </resultMap>
+  <sql id="Base_Column_List" >
+    inventory_id,
+    inventory_product_name,
+    inventory_product_bar,
+    inventory_remaining_num,
+    inventory_state,
+    inventory_desc,
+    inventory_create_time,
+    inventory_update_time
+  </sql>
+  <select id="getByInventoryId" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
+    select 
+    <include refid="Base_Column_List" />
+    from tb_rst_fm_inventory
+    where inventory_id = #{inventoryId,jdbcType=INTEGER}
+  </select>
+  <select id="listByInventoryId" resultMap="BaseResultMap" parameterType="InventoryInfo" >
+    select
+    inventory_id,
+    inventory_product_name,
+    inventory_product_bar,
+    inventory_remaining_num,
+    inventory_state,
+    inventory_desc,
+    inventory_create_time,
+    inventory_update_time
+    from
+    tb_rst_fm_inventory
+    <where>
+      <if test="inventoryId != null and inventoryId != ''">
+        inventory_id = #{inventoryId}
+      </if>
+      <if test="inventoryProductName != null and inventoryProductName != ''">
+        and inventory_product_name like CONCAT('%',#{inventoryProductName},'%')
+      </if>
+      <if test="inventoryProductBar != null and inventoryProductBar != ''">
+        and inventory_product_bar = #{inventoryProductBar}
+      </if>
+      <if test="inventoryState != null and inventoryState != ''">
+        and inventory_state = #{inventoryState}
+      </if>
+    </where>
+  </select>
+
+  <update id="updateById" parameterType="InventoryInfo" >
+    update tb_rst_fm_inventory
+    <set >
+      <if test="inventoryProductName != null and inventoryProductName != ''" >
+        inventory_product_name = #{inventoryProductName,jdbcType=VARCHAR},
+      </if>
+      <if test="inventoryProductBar != null and inventoryProductBar != ''" >
+        inventory_product_bar = #{inventoryProductBar,jdbcType=VARCHAR},
+      </if>
+      <if test="inventoryRemainingNum != null and inventoryRemainingNum != ''" >
+        inventory_remaining_num = #{inventoryRemainingNum},
+      </if>
+      <if test="inventoryState != null and inventoryState != ''" >
+        inventory_state = #{inventoryState,jdbcType=INTEGER},
+      </if>
+      <if test="inventoryDesc != null and inventoryDesc != ''" >
+        inventory_desc = #{inventoryDesc,jdbcType=VARCHAR},
+      </if>
+    </set>
+    where inventory_id = #{inventoryId,jdbcType=INTEGER}
+  </update>
+</mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -1291,8 +1291,10 @@ public class AdminCustomerController {
             return new ResponseJson(500, "该客诉信息没有问题描述!", 500);
         }
         describe = questionList.get(0);
+        CustomerInfo customerInfo = customerService.getCustomerInfo(Integer.parseInt(customerId));
         ResponseJson rj = new ResponseJson(200, "查询成功", 200);
         rj.addResponseKeyValue("describe", describe);
+        rj.addResponseKeyValue("customerInfo", customerInfo);
         return rj;
     }
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSignclosedController.java

@@ -16,6 +16,8 @@ import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedInfoMapper;
 import com.iamberry.rst.service.cm.mapper.ComplaintSignclosedProductInfoMapper;
 import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.ResponseJson;
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -167,6 +169,14 @@ public class AdminSignclosedController {
             msg.setReturnCode(502);
             return msg;
         }
+        JSONArray jsonArray = JSONArray.fromObject(orderItemString);
+        JSONObject jsonArray2  = jsonArray.getJSONObject(0);
+        if(jsonArray2.get("itemNum").equals("")){
+            msg.setResultCode(200);
+             msg.setReturnCode(503);
+            return msg;
+        }
+
         String signclosedDate = request.getParameter("signclosed_date");
         if(signclosedDate != null){
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/InventoryController.java

@@ -0,0 +1,191 @@
+package com.iamberry.rst.controllers.pts;
+
+import com.iamberry.rst.core.cm.*;
+import com.iamberry.rst.core.page.PageRequest;
+import com.iamberry.rst.core.page.PagedResult;
+import com.iamberry.rst.core.pts.PtsDevice;
+import com.iamberry.rst.core.pts.PtsMachine;
+import com.iamberry.rst.faces.cm.InventoryLogService;
+import com.iamberry.rst.faces.cm.InventoryService;
+import com.iamberry.rst.utils.StitchAttrUtil;
+import com.iamberry.wechat.tools.ResponseJson;
+import com.iamberry.wechat.tools.payUtil.StringUtil;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
+
+/**
+ * Created by Administrator on 2018/8/15.
+ */
+@Controller
+@RequestMapping("/admin/inventory")
+public class InventoryController {
+    @Autowired
+    private InventoryService inventoryService;
+    @Autowired
+    private InventoryLogService inventoryLogService;
+
+    /**
+     * 查询库存列表信息
+     *
+     * @param request
+     * @param pageNO
+     * @param pageTotal
+     * @param pageSize
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions("inventory:select:inventory")
+    @RequestMapping("/select_inventory_list")
+    public ModelAndView selectInventoryList(HttpServletRequest request,
+                                            @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
+                                            @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
+                                            @RequestParam(value = "pageSize", defaultValue = "10", required = false) int pageSize,
+                                            InventoryInfo inventoryInfo
+    ) throws Exception {
+        ModelAndView mv = new ModelAndView("cm/inventory/inventory_list");
+        StringBuilder url = new StringBuilder("/admin/inventory/select_inventory_list?pageSize=" + pageSize);
+        // 封装请求数据
+        PageRequest<InventoryInfo> pageRequest = new PageRequest<>(inventoryInfo, pageNO, pageSize, pageTotal == null);
+        // 查询订单列表
+        PagedResult<InventoryInfo> result = inventoryService.listByInventoryId(pageRequest);
+        long total = 0;
+        if (pageTotal == null) {
+            total = result.getPages();
+        } else {
+            total = pageTotal;
+            result.setPages(total);
+        }
+        StitchAttrUtil.getSa().setModelAndView(inventoryInfo, mv, "/admin/inventory/select_inventory_list", result);
+        return mv;
+    }
+
+    /**
+     * 查询日志列表信息
+     *
+     * @param request
+     * @param pageNO
+     * @param pageTotal
+     * @param pageSize
+     * @return
+     * @throws Exception
+     */
+    @RequiresPermissions("inventoryLog:select:inventoryLog")
+    @RequestMapping("/select_inventoryLog_list")
+    public ModelAndView selectInventoryLogList(HttpServletRequest request,
+                                               @RequestParam(value = "pageNO", defaultValue = "1", required = false) int pageNO,
+                                               @RequestParam(value = "pageTotal", required = false) Integer pageTotal,
+                                               @RequestParam(value = "pageSize", defaultValue = "10", required = false) int pageSize,
+                                               InventoryLog inventoryLog
+    ) throws Exception {
+        ModelAndView mv = new ModelAndView("cm/inventory/inventoryLog_list");
+        StringBuilder url = new StringBuilder("/admin/inventory/select_inventoryLog_list?pageSize=" + pageSize);
+        // 封装请求数据
+        PageRequest<InventoryLog> pageRequest = new PageRequest<>(inventoryLog, pageNO, pageSize, pageTotal == null);
+        // 查询订单列表
+        PagedResult<InventoryLog> result = inventoryLogService.listByInventoryLogId(pageRequest);
+        long total = 0;
+        if (pageTotal == null) {
+            total = result.getPages();
+        } else {
+            total = pageTotal;
+            result.setPages(total);
+        }
+        //查询所有仓库
+        List<WarehouseInfo> warehouseList = inventoryLogService.listFactoryInfo();
+        mv.addObject("warehouseList",warehouseList);
+        StitchAttrUtil.getSa().setModelAndView(inventoryLog, mv, "/admin/Inventory/select_InventoryLog_list", result);
+        return mv;
+    }
+
+    /**
+     * 获取库存信息
+     * @param
+     * @return
+     * @throws Exception
+     */
+    @ResponseBody
+    @RequiresPermissions("inventory:select:inventory")
+    @RequestMapping("/get_Inventory_id")
+    public ResponseJson getInventoryId(Integer inventoryId) throws Exception {
+        ResponseJson rj = new ResponseJson();
+        InventoryInfo inventoryInfo = inventoryService.getByInventoryId(inventoryId);
+        if(inventoryInfo == null){
+            rj.setReturnCode(500);
+            rj.setResultMsg("ERROR");
+        }else{
+            rj.addResponseKeyValue("inventoryInfo",inventoryInfo);
+        }
+        return rj;
+    }
+
+    /**
+     * 修改库存
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("signclosed:select:signclosed")
+    @RequestMapping(value = "/update_num")
+    public ResponseJson updateRemark(HttpServletRequest request,InventoryInfo inventoryInfo,Integer operationType,Integer type){
+        ResponseJson msg = new ResponseJson();
+        if(inventoryInfo == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        InventoryLog inventoryLog = new InventoryLog();
+        InventoryInfo info = inventoryService.getByInventoryId(inventoryInfo.getInventoryId());
+        if(operationType == 1){//增加
+            info.setInventoryRemainingNum(info.getInventoryRemainingNum()+inventoryInfo.getInventoryRemainingNum());
+            inventoryLog.setLogOperationType(1);
+        }else if(operationType == 2){//减少
+            info.setInventoryRemainingNum(info.getInventoryRemainingNum()-inventoryInfo.getInventoryRemainingNum());
+            inventoryLog.setLogOperationType(2);
+        }
+        Integer num = inventoryService.updateById(inventoryInfo);
+        if (num < 1) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+            inventoryLog.setLogCreateTime(new Date());
+            inventoryLog.setLogProductBar(info.getInventoryProductBar());
+            inventoryLog.setLogProductName(info.getInventoryProductName());
+            inventoryLog.setLogType(type);
+            inventoryLog.setLogWarehouseId(inventoryInfo.getInventoryId());
+            inventoryLogService.insert(inventoryLog);
+        }
+        return msg;
+    }
+
+
+    /**
+     * 跳转到修改库存数量页面
+     *
+     * @return
+     */
+    @RequiresPermissions("signclosed:update:signclosed")
+    @RequestMapping(value = "/to_update_inventory")
+    public ModelAndView toUpdateInventory(HttpServletRequest request,Integer inventoryId) {
+        ModelAndView mv = new ModelAndView("cm/inventory/update_inventory");
+        if(inventoryId == null){
+            return mv;
+        }
+        //查询所有仓库
+        List<WarehouseInfo> warehouseList = inventoryLogService.listFactoryInfo();
+        InventoryInfo info = inventoryService.getByInventoryId(inventoryId);
+        mv.addObject("warehouseList",warehouseList);
+        mv.addObject("info",info);
+        return mv;
+    }
+
+}

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -109,6 +109,10 @@
 		<typeAlias type="com.iamberry.rst.core.cm.ReturnStatisticsInfo" alias="ReturnStatisticsInfo"/>
 		<typeAlias type="com.iamberry.rst.core.cm.ComplaintDetectItem" alias="ComplaintDetectItem"/>
 		<typeAlias type="com.iamberry.rst.core.cm.DetectionBasis" alias="DetectionBasis"/>
+		<typeAlias type="com.iamberry.rst.core.cm.InventoryLog" alias="InventoryLog"/>
+		<typeAlias type="com.iamberry.rst.core.cm.InventoryInfo" alias="InventoryInfo"/>
+		<typeAlias type="com.iamberry.rst.core.cm.WarehouseInfo" alias="WarehouseInfo"/>
+		<typeAlias type="com.iamberry.rst.core.cm.FactoryInfo" alias="FactoryInfo"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>
@@ -175,5 +179,8 @@
 		<mapper resource="com/iamberry/rst/service/order/mapper/orderMapper.xml"/>
 		<mapper resource="com/iamberry/rst/service/order/mapper/orderBatchMapper.xml"/>
 
+		<mapper resource="com/iamberry/rst/service/cm/mapper/inventoryLogMapper.xml"/>
+		<mapper resource="com/iamberry/rst/service/cm/mapper/inventoryMapper.xml"/>
+
 	</mappers>
 </configuration>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/custome_list.ftl

@@ -409,6 +409,12 @@
                                         <font color=#06c>需要回访</font>
                                     </a><br/>
                                 </#if>
+                                <a style="text-decoration:none" href="javascript:void(0)" title="查询签收信息" onclick="toSignclosed(${customer.customerId!''})">
+                                    <font color=#06c>签收信息</font>
+                                </a><br/>
+                                <a style="text-decoration:none" href="javascript:void(0)" title="查询品检信息" onclick="toDetect(${customer.customerId!''})">
+                                    <font color=#06c>品检信息</font>
+                                </a><br/>
                             </td>
                         </tr>
                     </#list>
@@ -620,6 +626,18 @@
     function toUpdateReissue(customerId) {
         layer_show("补发处理","${path}/admin/customer/_to_update_reissue?customerId="+customerId,"800","500");
     }
+    /**
+     * 进入签收信息页面
+     */
+    function toSignclosed(customerId) {
+        layer_show("签收信息","${path}/admin/signclosed/select_signclosed_list?signclosedCustomerId="+customerId,"1000","500");
+    }
+    /**
+     * 进入检测信息页面
+     */
+    function toDetect(customerId) {
+        layer_show("品检信息","${path}/admin/detect/select_detect_list?customerId="+customerId,"1000","500");
+    }
 
     /*子页面添加完信息后回显添加结果是否成功*/
     function custome_result(str,num) {

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/add_detect.ftl

@@ -32,15 +32,15 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add">
         <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>客诉编号：</label>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>客诉编号：</label>
             <div class="formControls col-xs-8 col-sm-8 skin-minimal" style="margin: 10px 0px;">
                 <input class="my-input" type="text"  name="customerId" id="customerId" placeholder="请输入客诉编号，如没有请留空"/>
             </div>
         </div>
         <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>检测产品：</label>
-            <div class="formControls col-9 col-sm-9 huanhang" style="margin-bottom: 15px;">
-                <select id="productId" name="productId" class="select" style="width: 158px;">
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>检测产品：</label>
+            <div class="formControls col-8 col-sm-8 huanhang" style="margin: 10px 0px 10px -10px;">
+                <select id="productId" name="productId" class="my-select" style="width: 158px;">
                     <#if (productList?size > 0)>
                             <#list productList as product>
                                 <option value="${product.productId!""}">${product.productName!""}</option>
@@ -48,21 +48,21 @@
                     </#if>
                 </select>
 
-                <select id="productColorId" name="productColorId" class="select" style="width: 158px;">
+                <select id="productColorId" name="productColorId" class="my-select" style="width: 158px;">
 
                 </select>
             </div>
         </div>
         <div class="input-box">
-            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;"><span class="c-red">*</span>检测日期：</label>
-            <div class="formControls col-xs-8 col-sm-8 skin-minimal" style="margin: 10px 0px;width: 402px;">
-                <input class="my-input-date" type="text"  name="itemDate" id="itemDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
+            <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin-top: 14px;"><span class="c-red">*</span>检测日期：</label>
+            <div class="formControls col-xs-8 col-sm-8 skin-minimal" style="margin: 10px 0px;">
+                <input class="my-input" type="text"  name="itemDate" id="itemDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
             </div>
         </div>
 
         <div class="input-box">
             <label class="col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>检测结果：</label>
-            <div class="formControls col-xs-7 col-sm-7 skin-minimal huanhang" style="margin: 10px 0px;">
+            <div class="formControls col-xs-8 col-sm-8 skin-minimal huanhang" style="margin: 10px 0px;">
                 <div class="radio-box">
                     <input type="radio" id="radio-3" name="maintenanceResults" value="1" checked/>
                     <label for="radio-3">检测通过</label>
@@ -335,9 +335,9 @@
             success: function(data){
                 if (data.returnCode == 200) {
                     layer.msg('添加成功',{icon: 1,time:1000},function () {
-                        window.parent.location.reload();
-                        var index = parent.layer.getFrameIndex(window.name);
-                        parent.layer.close(index);
+                        location.replace(location.href);
+                        window.location.href= "${path}/admin/detect/select_detect_list";
+
                     });
                 } else {
                     layer.msg('添加失败',{icon: 5,time:1000});

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/detect_list.ftl

@@ -40,8 +40,8 @@
 <div class="page-container">
     <div class="text-c">
         <form name="form1" action="${path}/admin/detect/select_detect_list" method="post">
-            <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_detect('添加品质检测','${path}/admin/detect/to_add_detect','670','450');">新建品检</button>
-            <select id="productId" name="productId" class="select" style="width: 120px;">
+            <button type="button" style="cursor:pointer;float: left;" class="my-btn-search" onclick="add_detect('${path}/admin/detect/to_add_detect');">新建品检</button>
+            <select id="productId" name="productId" class="my-select" style="width: 120px;">
             <#if (productList?size > 0)>
                 <#list productList as product>
                 <#if productId??>
@@ -53,7 +53,7 @@
             </#if>
             </select>
 
-            <select id="productColorId" name="productColorId" class="select" style="width: 120px;">
+            <select id="productColorId" name="productColorId" class="my-select" style="width: 120px;">
 
             </select>
             <input class="my-input" style="width: 70px;" type="text" name="customerId" value="${customerId!}" placeholder="客诉编号"/>
@@ -143,16 +143,16 @@
                     <td class="text-c" width="100">${(detect.detectItemDate?string("yyyy-MM-dd"))!''}</td>
                     <!-- 遍历操作 -->
                     <td class="td-manage text-c">
-                        <a style="text-decoration:none" href="javascript:;" title="修改备注"
+                        <#--<a style="text-decoration:none" href="javascript:;" title="修改备注"
                            onclick="add_remark('修改备注','${path}/admin/detect/to_add_remark?detectItemId=${detect.detectItemId!''}','570','450');">
                             <i class="Hui-iconfont">&#xe6df;</i>
-                        </a>
+                        </a>-->
                         <a style="text-decoration:none" href="javascript:;" title="删除"
                            onclick="detele(${detect.detectItemId!''});">
                             <i class="Hui-iconfont">&#xe609;</i>
                         </a>
                             <a style="text-decoration:none" href="javascript:;" title="修改检测信息"
-                               onclick="update_info('修改检测信息','${path}/admin/detect/to_update_complete?detectItemId=${detect.detectItemId!''}','800','550');">
+                               onclick="update_info('${path}/admin/detect/to_update_complete?detectItemId=${detect.detectItemId!''}');">
                                 <i class="Hui-iconfont">&#xe60c;</i>
                             </a>
                         <#--<#if detect.signclosedId??>
@@ -182,16 +182,16 @@
         getProduct($("#productId").children('option:selected').val())
     });
     /*添加*/
-    function add_detect(title,url,w,h){
-        layer_show(title,url,w,h);
+    function add_detect(url){
+        window.location.href=url;
     }
     /*修改备注*/
     function add_remark(title,url,w,h){
         layer_show(title,url,w,h);
     }
     /*转入生产*/
-    function update_info(title,url,w,h){
-        layer_show(title,url,w,h);
+    function update_info(url){
+        window.location.href=url;
     }
     /**
      * 进入查询问题描述信息页面

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inspection/update_complete.ftl

@@ -90,8 +90,8 @@
         </div>
         <div class="input-box">
             <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;margin: 10px 0px;"><span class="c-red">*</span>检测日期：</label>
-            <div class="formControls col-8 col-sm-8 text-c huanhang" style="margin-left: -4%;margin: 10px 0px;">
-                <input class="my-input-date" style="width: 94%;" type="text" value="<#if detectInfo.detectItemDate??>${detectInfo.detectItemDate?string("yyyy-MM-dd")!''}</#if>" name="detect_date" id="detectItemDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
+            <div class="formControls col-8 col-sm-8 text-c huanhang" style="margin-left: -4%;margin: 10px 0px 10px -14px;">
+                <input class="my-input" style="width: 94%;" type="text" value="<#if detectInfo.detectItemDate??>${detectInfo.detectItemDate?string("yyyy-MM-dd")!''}</#if>" name="detect_date" id="detectItemDate" onClick="WdatePicker({skin:'whyGreen',maxDate:'%y-%M-%d'})" placeholder="请选择检测日期" readonly="readonly"/>
             </div>
         </div>
         <div class="input-box">

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventoryLog_list.ftl

@@ -0,0 +1,138 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+<#include "/base/list_base.ftl">
+    <style>
+        *{padding: 0;margin: 0;}
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 25px;margin-right: 5px;}
+        /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .barcodeImg{margin:10px 0px}
+        .table-bg thead th{background-color: #e2f6ff;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #44C861;border: 1px solid #44C861;border-radius: 5px;color: #E5EAEA;font-weight:bold;}
+        .txt{
+            width:60px;
+            border:1px solid #ddd;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+        .txt2{
+            width:60px;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+
+    </style>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 库存管理
+    <span class="c-gray en">&gt;</span> 库存日志列表
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+    <div class="text-c">
+        <form name="form1" action="${path}/admin/inventory/select_inventoryLog_list" method="post">
+        <#--<input class="my-input" style="width: 70px;" type="text" name="signclosedCustomerId" value="${signclosedCustomerId!}" placeholder="客诉编号"/>
+        <input class="my-input" style="width: 70px;" type="text" name="signclosedSendName" value="${signclosedSendName!}" placeholder="寄件人姓名"/>
+        <input class="my-input" style="width: 70px;" type="text" name="signclosedSendTel" value="${signclosedSendTel!}" placeholder="寄件人电话号码"/>
+        <input class="my-input" style="width: 70px;" type="text" name="signclosedLogisticsNumber" value="${signclosedLogisticsNumber!}" placeholder="快递单号"/>-->
+        <select class="my-select" name="logType" style="height: 30px;width: 150px">
+            <option value ="">选择类型</option>
+            <option value ="1" <#if logType??><#if logType == 1>selected="selected"</#if></#if>>采购</option>
+            <option value ="2" <#if logType??><#if logType == 2>selected="selected"</#if></#if>>发货</option>
+            <option value ="3" <#if logType??><#if logType == 3>selected="selected"</#if></#if>>次品</option>
+        </select>
+             <select class="my-select" name="logOperationType" style="height: 30px;width: 150px">
+             <option value ="">选择操作类型</option>
+             <option value ="1" <#if logOperationType??><#if logOperationType == 1>selected="selected"</#if></#if>>增加</option>
+             <option value ="2" <#if logOperationType??><#if logOperationType == 2>selected="selected"</#if></#if>>减少</option>
+        </select>
+        <select id="logWarehouseId" name="logWarehouseId" class="select" style="width: 120px;">
+        <#if (warehouseList?size > 0)>
+            <#list warehouseList as info>
+                <#if logWarehouseId??>
+                    <option value="${info.warehouseId!""}" <#if info.warehouseId == logWarehouseId>selected</#if>>${info.warehouseName!""}</option>
+                <#else >
+                    <option value="${info.warehouseName!""}" >${info.warehouseName!""}</option>
+                </#if>
+            </#list>
+        </#if>
+        </select>
+        <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
+        </form>
+    </div>
+    <div class="mt-20">
+        <table class="table table-border table-bordered table-bg table-hover table-sort">
+            <thead>
+            <tr class="text-c">
+                <th width="100">产品名称</th>
+                <th width="100">产品sku</th>
+                <th width="100">仓库名称</th>
+                <th width="100">变动数量</th>
+                <th width="100">类型</th>
+                <th width="100">操作类型</th>
+                <th width="100">备注</th>
+            </tr>
+            </thead>
+            <tbody id="listid">
+            <#if (page.dataList?size > 0)>
+                <#list page.dataList as info>
+                <tr>
+                    <td class="text-c" width="100">${info.logProductName!}</td>
+                    <td class="text-c" width="100">${info.logProductBar!}</td>
+                    <td class="text-c" width="100">${info.logWarehouseName!}</td>
+                    <td class="text-c" width="100">${info.logRemainingNum!}</td>
+                    <td class="text-c" width="100">
+                        <#if info.logType == 1>
+                            采购
+                        </#if>
+                        <#if info.logType == 2>
+                            发货
+                        </#if>
+                        <#if info.logType == 3>
+                            次品
+                        </#if>
+                    </td>
+                    <td class="text-c" width="100">
+                        <#if info.logType == 1>
+                            增加
+                        </#if>
+                        <#if info.logType == 2>
+                            减少
+                        </#if>
+                    </td>
+                    <td class="text-c" width="100">${info.logDesc!}</td>
+                </tr>
+                </#list>
+            <#else >
+            <tr><td class="td-manage text-c" colspan = "6">暂时没有库存日志信息</td></tr>
+            </#if>
+            </tbody>
+        </table>
+    </div>
+</div>
+<div style="padding-top: 10px;"></div>
+<#include "/base/page_util.ftl">
+<script type="text/javascript" src="${path}/common/lib/jquery.PrintArea/jquery.PrintArea.js"></script>
+<script type="text/javascript">
+    /**
+     * 进入查询问题描述信息页面
+     */
+    function getDescribeInfo(customerId) {
+        layer_show("问题描述","${path}/admin/customer/_question_describe?customerId="+customerId,"800","500");
+    }
+    /*转入品检*/
+    function into_complaint(title,url,w,h){
+        layer_show(title,url,w,h);
+    }
+</script>
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/inventory/inventory_list.ftl

@@ -0,0 +1,159 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+<#include "/base/list_base.ftl">
+    <style>
+        *{padding: 0;margin: 0;}
+        .my-input{border: 1px solid rgba(0,0,0,.1);padding: 1px 5px;height: 25px;margin-right: 5px;}
+        /*.my-input::-webkit-input-placeholder,.my-select{color: #dcdcdc;}*/
+        .my-select{border: 1px solid rgba(0,0,0,.1);padding:6px 50px 6px 15px;height: 34px;margin: 0 10px; -webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/select-1.png) right center no-repeat;background-size:auto 100%;}
+        .my-btn-search{border: 1px solid #32a3d8;padding: 1px 25px;height: 32px;background-color: #32a3d8;color: #fff;}
+        .barcodeImg{margin:10px 0px}
+        .table-bg thead th{background-color: #e2f6ff;}
+        input[type=radio]{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-1.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
+        .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #44C861;border: 1px solid #44C861;border-radius: 5px;color: #E5EAEA;font-weight:bold;}
+        .txt{
+            width:60px;
+            border:1px solid #ddd;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+        .txt2{
+             width:60px;
+             overflow: hidden;
+             white-space: nowrap;
+             text-overflow: ellipsis;
+         }
+
+    </style>
+</head>
+<body>
+<nav class="breadcrumb"><i class="Hui-iconfont">&#xe67f;</i> 首页
+    <span class="c-gray en">&gt;</span> 库存管理
+    <span class="c-gray en">&gt;</span> 库存列表
+    <a class="btn radius r" style="line-height:1.6em;margin-top:3px;background: #32a3d8;color: #fff;" href="javascript:location.replace(location.href);" title="刷新" ><i class="Hui-iconfont">&#xe68f;</i></a>
+</nav>
+<div class="page-container">
+    <div class="text-c">
+        <form name="form1" action="${path}/admin/inventory/select_inventory_list" method="post">
+            <select id="inventoryProductBar" name="inventoryProductBar" class="select" style="width: 120px;">
+            <#if (productList?size > 0)>
+                <#list productList as product>
+                    <#if inventoryProductBar??>
+                        <option value="${product.colorBar!""}" <#if product.colorBar == inventoryProductBar>selected</#if>>${product.productName!""}</option>
+                    <#else >
+                        <option value="${product.colorBar!""}" >${product.productName!""}</option>
+                    </#if>
+                </#list>
+            </#if>
+            </select>
+
+            <select id="productColorId" name="productColorId" class="select" style="width: 120px;">
+
+            </select>
+            <button style="cursor:pointer;" type="submit" class="my-btn-search">搜索</button>
+        </form>
+    </div>
+    <div class="mt-20">
+        <table class="table table-border table-bordered table-bg table-hover table-sort">
+            <thead>
+            <tr class="text-c">
+                <th width="100">产品名称</th>
+                <th width="160">产品sku</th>
+                <th width="120">库存剩余数量</th>
+                <th width="120">状态</th>
+                <th width="200">备注</th>
+                <th width="50">操作</th>
+            </tr>
+            </thead>
+            <tbody id="listid">
+            <#if (page.dataList?size > 0)>
+                <#list page.dataList as info>
+                <tr>
+                    <td class="text-c" width="100">${info.inventoryProductName!}</td>
+                    <td class="text-c" width="100">${info.inventoryProductBar!}</td>
+                    <td class="text-c" width="100">${info.inventoryRemainingNum!}</td>
+                    <td class="text-c" width="100">
+                    <#if info.inventoryState == 1>
+                        正在使用
+                    </#if>
+                    <#if info.inventoryState == 2>
+                        暂停使用
+                    </#if>
+                    </td>
+                    <td class="text-c" width="100">${info.inventoryDesc!}</td>
+                    <!-- 遍历操作 -->
+                    <td class="td-manage text-c">
+                        <a style="text-decoration:none" href="javascript:;" title="增加库存"
+                           onclick="add_remark('增加库存','${path}/admin/inventory/to_update_inventory?inventoryId=${info.inventoryId!''}','570','450');">
+                            <i class="Hui-iconfont">&#xe600;</i>
+                        </a>
+                        <a style="text-decoration:none" href="javascript:;" title="减少库存"
+                           onclick="add_remark('减少库存','${path}/admin/inventory/to_update_inventory?inventoryId=${info.inventoryId!''}','570','450');">
+                            <i class="Hui-iconfont">&#xe6a1;</i>
+                        </a>
+                    </td>
+                </tr>
+                </#list>
+            <#else >
+            <tr><td class="td-manage text-c" colspan = "6">暂时没有库存信息</td></tr>
+            </#if>
+            </tbody>
+        </table>
+    </div>
+</div>
+<div style="padding-top: 10px;"></div>
+<#include "/base/page_util.ftl">
+<script type="text/javascript" src="${path}/common/lib/jquery.PrintArea/jquery.PrintArea.js"></script>
+<script type="text/javascript">
+    /**
+     * 进入查询问题描述信息页面
+     */
+    function getDescribeInfo(customerId) {
+        layer_show("问题描述","${path}/admin/customer/_question_describe?customerId="+customerId,"800","500");
+    }
+    /*转入品检*/
+    function into_complaint(title,url,w,h){
+        layer_show(title,url,w,h);
+    }
+    $(function(){
+        getProduct($("#productId").children('option:selected').val())
+    });
+    //查询产品颜色信息
+    $('#productId').change(function(){
+        getProduct($(this).children('option:selected').val())
+    })
+    function  getProduct(productId) {
+        $.ajax({
+            cache: true,
+            type: "POST",
+            url: "${path}/admin/product/get_product",
+            data:{colorProductId:productId},// 你的formid
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    $("#productColorId").empty();
+                    if(data.returnMsg.productColorList.length > 0){
+                        for(var i=0;i<data.returnMsg.productColorList.length;i++){
+                            var productColor = data.returnMsg.productColorList[i];
+                            $("#productColorId").append('<option value='+productColor.colorId+'>'+productColor.colorName+'</option>');
+                        }
+                    }else{
+                        $("#productColorId").append('<option>暂无产品颜色</option>');
+                    }
+
+                }
+
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+                layer.msg('添加错误',{icon: 5,time:1000});
+            }
+        });
+    }
+</script>
+</body>
+</html>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/add_signclosed.ftl

@@ -437,7 +437,6 @@
         }*/
         var signclosedLogistics = $("#signclosedLogistics").val();
         if( signclosedLogistics == null || signclosedLogistics == "" ){
-            alert(signclosedLogistics);
             layer.msg('请选择物流公司',{icon: 5,time:1000});
             return;
         }
@@ -527,9 +526,7 @@
                 } else if(data.returnCode == 502) {
                     layer.msg('请至少选择一件已签收的产品',{icon: 5,time:1000});
                 } else if(data.returnCode == 503) {
-                    layer.msg('请输入产品数量',{icon: 5,time:1000});
-                } else if(data.returnCode == 504) {
-                    layer.msg('请输入配件数量',{icon: 5,time:1000});
+                    layer.msg('有产品数量未填写，如本次签收没有此产品，请删除',{icon: 5,time:1000});
                 }else{
                     layer.msg('添加失败',{icon: 5,time:1000});
                 }
@@ -599,7 +596,7 @@
                                     ' <td>'+ cufte(productColor.colorName) +'</td>' +
                                     ' <td>'+ cufte(productColor.colorPrice)/100 +'</td>' +
                                     ' <td>'+ cufte(productColor.colorBar) +'</td>' +
-                                    ' <td><input type="text" class="input-text input-number item-num"  style="width: 100%;border: none;text-align: center;" name="" id="" placeholder="产品数量" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>' +
+                                    ' <td><input type="text" class="input-text input-number item-num"  style="width: 100%;border: none;text-align: center;" name="" id="" placeholder="产品数量" value="1" onkeyup="keyFun($(this),999,1)" onpaste="keyFun($(this),999,1)"></td>' +
                                     ' <td><a href="javascript:void(0)" class="del_product all_down" onclick="delProduct($(this))" >删除</a></td>' +
                                     ' </tr>';
                         }

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/associated_customer.ftl

@@ -33,18 +33,88 @@
         <div class="input-box"   style="text-align:center;">
             <span class="input-dic spanhidth">客诉编号</span>
             <input type="text" style="" class="input-text" placeholder="客诉编号" id="signclosedCustomerId" name="signclosedCustomerId">
+            <button type="button" class="my-btn-submit" onclick="select();">查询</button>
         </div>
-        <div style="text-align:center;">
+        <div style="text-align:center;display: none" id="associatedId">
         <#if signclosedId??>
             <input type="hidden" value="${signclosedId!''}" id="signclosedId" name="signclosedId">
         </#if>
-           <button type="button" class="my-btn-submit" onclick="update();">确认提交</button>
+           <button type="button" class="my-btn-submit" onclick="update();">确认关联</button>
+        </div>
+        <div id="customerDiv" style="display: none">
+            <#--<div class="row cl">
+                <div class="formControls col-2 col-sm-2 text-r">
+                    <strong>客诉时间：</strong>
+                </div>
+                <div class="formControls col-8 col-sm-8" id="customerCreateTime">
+
+                </div>
+            </div>-->
+            <div class="row cl">
+                <div class="formControls col-2 col-sm-2">
+                    <strong>客诉标题：</strong>
+                </div>
+                <div class="formControls col-6 col-sm-6" id="txtDescribeTitle">
+
+                </div>
+            </div>
+            <div class="row cl">
+                <div class="formControls col-2 col-sm-2">
+                    <strong>客诉回复：</strong>
+                </div>
+                <div class="formControls col-6 col-sm-6" id="txtDescribeContent">
+
+                </div>
+            </div>
+            <div class="row cl">
+                <div class="formControls col-2 col-sm-2">
+                    <strong>姓名：</strong>
+                </div>
+                <div class="formControls col-6 col-sm-6" id="customerName">
+
+                </div>
+            </div>
+
+            <div class="row cl">
+                <div class="formControls col-2 col-sm-2">
+                    <strong>手机号：</strong>
+                </div>
+                <div class="formControls col-6 col-sm-6" id="customerTel">
+
+                </div>
+            </div>
         </div>
     </form>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript">
 
+    function select() {
+        var signclosedCustomerId = $("#signclosedCustomerId").val();
+        $.ajax({
+            cache: true,
+            type: "POST",
+            data: {"customerId":signclosedCustomerId},
+            url: "${path}/admin/customer/get_describe_info",
+            async: false,
+            success: function(data){
+                if (data.returnCode == 200) {
+                    var describe = data.returnMsg.describe;
+                    var customer = data.returnMsg.customerInfo;
+                    /*$('#customerCreateTime').html(formatDate(describe.customerCreateTime,"yyyy-MM-dd"));*/
+                    $('#txtDescribeTitle').html(describe.describeTitle);
+                    $('#txtDescribeContent').html(describe.describeContent);
+                    $('#customerName').html(customer.customerName);
+                    $('#customerTel').html(customer.customerTel);
+                    $("#customerDiv").show();
+                    $("#associatedId").show();
+                }
+            },
+            error: function(XmlHttpRequest, textStatus, errorThrown){
+            }
+        })
+    }
+
 
     function  update() {
         var signclosedCustomerId = $("#signclosedCustomerId").val();

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/customer_signclosed_list.ftl

@@ -149,17 +149,17 @@
                     <td class="text-c" width="100">${signclosed.signclosedDesc!}</td>
                     <!-- 遍历操作 -->
                     <td class="td-manage text-c">
-                        <a style="text-decoration:none" href="javascript:;" title="修改备注"
+                       <#-- <a style="text-decoration:none" href="javascript:;" title="修改备注"
                            onclick="add_remark('修改备注','${path}/admin/signclosed/to_update_customer_remark?signclosedId=${signclosed.signclosedId!''}','570','450');">
                             <i class="Hui-iconfont">修改备注</i>
-                        </a>
+                        </a>-->
                        <#-- <a style="text-decoration:none" href="javascript:;" title="打印"
                            onclick="print_aftermarket(${signclosed.signclosedId!''});">
                             <i class="Hui-iconfont">&#xe652;</i>
                         </a>-->
                         <#if !signclosed.signclosedCustomerId??>
                              <a style="text-decoration:none" href="javascript:;" title="关联客诉"
-                              onclick="associated_customer('关联客诉','${path}/admin/signclosed/to_associated_customer?signclosedId=${signclosed.signclosedId!''}','570','450');">
+                              onclick="associated_customer('关联客诉','${path}/admin/signclosed/to_associated_customer?signclosedId=${signclosed.signclosedId!''}','770','550');">
                                  <i>关联客诉</i>
                              </a>
                         </#if>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -16,14 +16,14 @@
         input[type=radio]:checked{-webkit-appearance:none;appearance:none;background: url(${path}/common/images/pts/radio-2.png) center center no-repeat;background-size:auto 100%;width: 20px;height: 20px;margin-right: 10px;}
         .update-parts>span{margin-right: 10px;padding: 3px 4px;background-color: #44C861;border: 1px solid #44C861;border-radius: 5px;color: #E5EAEA;font-weight:bold;}
         .txt{
-            width:60px;
+            width:100px;
             border:1px solid #ddd;
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
         }
         .txt2{
-             width:60px;
+             width:100px;
              overflow: hidden;
              white-space: nowrap;
              text-overflow: ellipsis;
@@ -63,12 +63,12 @@
         <table class="table table-border table-bordered table-bg table-hover table-sort">
             <thead>
             <tr class="text-c">
-                <th width="100">客诉编号</th>
+                <th width="50">客诉编号</th>
                 <th width="160">物流</th>
-                <th width="120">寄件人姓名</th>
-                <th width="120">寄件人电话</th>
-                <th width="200">签收产品</th>
-                <th width="200">状态</th>
+                <th width="100">寄件人姓名</th>
+                <th width="100">寄件人电话</th>
+                <th width="250">签收产品</th>
+                <th width="100">状态</th>
                 <th width="130">退货地区</th>
                 <th width="90">售后原因</th>
                 <th width="150">客服备注</th>
@@ -81,8 +81,7 @@
             <#if (page.dataList?size > 0)>
                 <#list page.dataList as signclosed>
                 <tr>
-                    <td class="text-c" width="100">${signclosed.signclosedCustomerId!}</td>
-
+                    <td class="text-c" width="70">${signclosed.signclosedCustomerId!}</td>
                     <td class="text-c" width="160">
                         <#if signclosed.signclosedLogistics??>
                             <#if signclosed.signclosedLogistics == "sto">
@@ -174,16 +173,16 @@
                             </a>
                             <#if signclosed.signclosedState == 1>
                             <a style="text-decoration:none" href="javascript:;" title="转入品检"
-                               onclick="into_complaint('转入品检','${path}/admin/signclosed/to_into_complaint?signclosedId=${signclosed.signclosedId!''}','570','450');">
+                               onclick="into_complaint('转入品检','${path}/admin/signclosed/to_into_complaint?signclosedId=${signclosed.signclosedId!''}','770','600');">
                                 <i class="Hui-iconfont">&#xe644;</i>
                             </a>
                             </#if>
-                            <#if !signclosed.signclosedCustomerId??>
+                            <#--<#if !signclosed.signclosedCustomerId??>
                                 <a style="text-decoration:none" href="javascript:;" title="关联客诉"
                                    onclick="associated_customer('关联客诉','${path}/admin/signclosed/to_associated_customer?signclosedId=${signclosed.signclosedId!''}','570','450');">
                                     <i class="Hui-iconfont">&#xe6f1;</i>
                                 </a>
-                            </#if>
+                            </#if>-->
 
                     </td>
                 </tr>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/update_sender.ftl

@@ -38,70 +38,6 @@
 <article class="page-container">
     <form class="form form-horizontal" id="form-admin-add"  style="    margin-left: 7%;">
         <div >
-<#--
-            <div class="row cl">
-                <label class="form-label col-3">
-                    <div class="tit-2">原寄送信息</div>
-                </label>
-                <div class="formControls col-9">
-                </div>
-            </div>
-
-            &lt;#&ndash;<div class="row cl">&ndash;&gt;
-                &lt;#&ndash;<label class=" col-3 col-sm-3" style="color: #0000cc;">原寄送信息</label>&ndash;&gt;
-            &lt;#&ndash;</div>&ndash;&gt;
-            <div class="row cl">
-                <label class=" col-3 col-sm-3 huanhang" style="text-align: right;">寄件人姓名：</label>
-                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
-                        <span>
-                            ${complaintSignclosedInfo.signclosedSendName!''}
-                        </span>
-                </div>
-            </div>
-            <div class="row cl" style="position: relative;">
-                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">寄件人电话：</label>
-                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
-                        <span>
-                        ${complaintSignclosedInfo.signclosedSendTel!''}
-                        </span>
-                </div>
-            </div>
-            <div class="row cl" style="position: relative;">
-                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">物流公司：</label>
-                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
-                        <span>
-                            <#if complaintSignclosedInfo.signclosedLogistics??>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "sto">申通快递</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "yto">圆通快递</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "sf">顺丰快递</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "ems">邮政EMS</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "zto">中通快递</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "zjs">宅急送</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "yunda">韵达快递</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "pick">上门提货</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "htky">汇通快递</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "ttkdex">天天快递</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "jd">京东快递</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "01">其他</#if>
-                            <#if complaintSignclosedInfo.signclosedLogistics == "02">上门送货</#if>
-                            </#if>
-                        </span>
-                </div>
-            </div>
-
-            <div class="row cl" style="position: relative;">
-                <label class="form-label col-3 col-sm-3 huanhang" style="text-align: right;">物流单号：</label>
-                <div class="formControls col-6 col-sm-6 skin-minimal huanhang">
-                        <span>
-                        <#if complaintSignclosedInfo.signclosedLogisticsNumber??>
-                            ${complaintSignclosedInfo.signclosedLogisticsNumber!''}
-                        </#if>
-                        </span>
-                </div>
-            </div>
-        </div>
-        <div>-->
-
             <div class="row cl">
                 <label class="form-label col-3">
                     <div class="tit-2">寄送信息</div>
@@ -175,7 +111,7 @@
                 </div>
             </div>
         </div>
-        <div style="text-align:center;">
+        <div>
         <#if signclosedId??>
             <input type="hidden" value="${signclosedId!''}" id="signclosedId" name="signclosedId">
         </#if>