lrl -2021-11-30

src/main/java/com/steerinfo/ems/trmmaterial/controller/TRmMaterialController.java

@@ -3,6 +3,7 @@ package com.steerinfo.ems.trmmaterial.controller;
 import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.trmmaterial.model.TRmMaterial;
 import com.steerinfo.ems.trmmaterial.service.ITRmMaterialService;
+import com.steerinfo.ems.trmworkproc.model.TRmWorkproc;
 import com.steerinfo.ems.trmworkprocmaterial.service.ITRmWorkprocMaterialService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -173,4 +174,18 @@ public class TRmMaterialController extends BaseRESTfulController {
         }
         return success();
     }
+
+    @ApiOperation(value="查询", notes="盘库查询页面")
+    @GetMapping("/getDataForPk")
+    public RESTfulResult getDataForPk(@RequestParam HashMap<String,Object> parmas){
+        if(parmas.get("materialid") != null && !parmas.get("materialid").toString().isEmpty()){
+            String materialid = parmas.get("materialid").toString();
+            if(!materialid.startsWith("'")){
+                materialid = "'" + materialid.replaceAll(",", "','").replaceAll("，", "','") + "'";
+            }
+            parmas.put("materialid", materialid);
+        }
+        List<TRmWorkproc> dataForPk = tRmMaterialService.getDataForPk(parmas);
+        return success(dataForPk);
+    }
 }

src/main/java/com/steerinfo/ems/trmmaterial/mapper/TRmMaterialMapper.java

@@ -1,10 +1,12 @@
 package com.steerinfo.ems.trmmaterial.mapper;
 
 import com.steerinfo.ems.trmmaterial.model.TRmMaterial;
+import com.steerinfo.ems.trmworkproc.model.TRmWorkproc;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -29,4 +31,5 @@ public interface TRmMaterialMapper extends IBaseMapper<TRmMaterial, String> {
      */
     String getMaxNo();
 
+    List<TRmWorkproc> getDataForPk(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/ems/trmmaterial/mapper/TRmMaterialMapper.xml

@@ -335,4 +335,12 @@
          select max(to_number(SEQNO)) from T_RM_MATERIAL
     </select>
 
+  <select id="getDataForPk" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    SELECT ID,NAME FROM T_RM_MATERIAL
+    <where>
+      <if test="materialid != null and  materialid != ''">
+        and ID in  (${materialid})
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/steerinfo/ems/trmmaterial/service/ITRmMaterialService.java

@@ -1,10 +1,12 @@
 package com.steerinfo.ems.trmmaterial.service;
 
 import com.steerinfo.ems.trmmaterial.mapper.TRmMaterialMapper;
+import com.steerinfo.ems.trmworkproc.model.TRmWorkproc;
 import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.ems.trmmaterial.model.TRmMaterial;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -40,4 +42,6 @@ public interface ITRmMaterialService extends IBaseService<TRmMaterial, String>{
      * 获取最大序列
      */
     String getMaxNo();
+
+    List<TRmWorkproc> getDataForPk(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/ems/trmmaterial/service/impl/TRmMaterialServiceImpl.java

@@ -1,5 +1,6 @@
 package com.steerinfo.ems.trmmaterial.service.impl;
 
+import com.steerinfo.ems.trmworkproc.model.TRmWorkproc;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.ems.trmmaterial.model.TRmMaterial;
@@ -8,6 +9,7 @@ import com.steerinfo.ems.trmmaterial.service.ITRmMaterialService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -55,5 +57,10 @@ public class TRmMaterialServiceImpl extends BaseServiceImpl<TRmMaterial, String>
         return tRmMaterialMapper.getMaxNo();
     }
 
+    @Override
+    public List<TRmWorkproc> getDataForPk(HashMap<String, Object> params) {
+        return tRmMaterialMapper.getDataForPk(params);
+    }
+
 
 }

src/main/java/com/steerinfo/ems/trmproduct/controller/TRmProductController.java

@@ -174,4 +174,18 @@ public class TRmProductController extends BaseRESTfulController {
         return success(idAndName);
     }
 
+    @ApiOperation(value="查询", notes="盘库查询页面")
+    @GetMapping("/getDataForPk")
+    public RESTfulResult getDataForPk(@RequestParam HashMap<String,Object> parmas){
+        if(parmas.get("productid") != null && !parmas.get("productid").toString().isEmpty()){
+            String productid = parmas.get("productid").toString();
+            if(!productid.startsWith("'")){
+                productid = "'" + productid.replaceAll(",", "','").replaceAll("，", "','") + "'";
+            }
+            parmas.put("productid", productid);
+        }
+        List<TRmProduct> idAndName = tRmProductService.getDataForPk(parmas);
+        return success(idAndName);
+    }
+
 }

src/main/java/com/steerinfo/ems/trmproduct/mapper/TRmProductMapper.java

@@ -5,6 +5,7 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -43,5 +44,8 @@ public interface TRmProductMapper extends IBaseMapper<TRmProduct, String> {
      */
     Set<String> getBcode(@Param("productid") String productid);
 
+    //获取指定的产品
+    List<TRmProduct> getDataForPk(HashMap<String, Object> params);
+
 
 }

src/main/java/com/steerinfo/ems/trmproduct/mapper/TRmProductMapper.xml

@@ -381,5 +381,12 @@
     <select id="getBcode" parameterType="string" resultType="string">
         select t1.bcode from T_RM_PRODUCT t1 where t1.id=#{productid}
     </select>
-
+  <select id="getDataForPk" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    SELECT ID,NAME FROM  T_RM_PRODUCT
+    <where>
+      <if test="productid != null and  productid != ''">
+        and ID in  (${productid})
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/steerinfo/ems/trmproduct/service/ITRmProductService.java

@@ -4,6 +4,7 @@ import com.steerinfo.framework.service.IBaseService;
 import com.steerinfo.ems.trmproduct.model.TRmProduct;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -53,4 +54,7 @@ public interface ITRmProductService extends IBaseService<TRmProduct, String>{
      */
     Set<String> getBcode(@Param("productid") String productid);
 
+    //获取指定的产品
+    List<TRmProduct> getDataForPk(HashMap<String, Object> params);
+
 }

src/main/java/com/steerinfo/ems/trmproduct/service/impl/TRmProductServiceImpl.java

@@ -8,6 +8,7 @@ import com.steerinfo.ems.trmproduct.service.ITRmProductService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
@@ -64,4 +65,9 @@ public class TRmProductServiceImpl extends BaseServiceImpl<TRmProduct, String> i
     public Set<String> getBcode(String productid) {
         return tRmProductMapper.getBcode(productid);
     }
+
+    @Override
+    public List<TRmProduct> getDataForPk(HashMap<String, Object> params) {
+        return tRmProductMapper.getDataForPk(params);
+    }
 }

src/main/java/com/steerinfo/ems/trmworkproc/controller/TRmWorkprocController.java

@@ -3,6 +3,7 @@ package com.steerinfo.ems.trmworkproc.controller;
 import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.Utils.TreeUtils;
 import com.steerinfo.ems.trmactitem.service.ITRmActItemService;
+import com.steerinfo.ems.trmproduct.model.TRmProduct;
 import com.steerinfo.ems.trmworkproc.mapper.TRmWorkprocMapper;
 import com.steerinfo.ems.trmworkproc.model.TRmWorkproc;
 import com.steerinfo.ems.trmworkproc.service.ITRmWorkprocService;
@@ -235,4 +236,17 @@ public class TRmWorkprocController extends BaseRESTfulController {
         }
         return success();
     }
+    @ApiOperation(value="查询", notes="盘库查询页面")
+    @GetMapping("/getDataForPk")
+    public RESTfulResult getDataForPk(@RequestParam HashMap<String,Object> parmas){
+        if(parmas.get("workprocid") != null && !parmas.get("workprocid").toString().isEmpty()){
+            String workprocid = parmas.get("workprocid").toString();
+            if(!workprocid.startsWith("'")){
+                workprocid = "'" + workprocid.replaceAll(",", "','").replaceAll("，", "','") + "'";
+            }
+            parmas.put("workprocid", workprocid);
+        }
+        List<TRmWorkproc> dataForPk = tRmWorkprocService.getDataForPk(parmas);
+        return success(dataForPk);
+    }
 }

src/main/java/com/steerinfo/ems/trmworkproc/mapper/TRmWorkprocMapper.java

@@ -1,5 +1,6 @@
 package com.steerinfo.ems.trmworkproc.mapper;
 
+import com.steerinfo.ems.trmproduct.model.TRmProduct;
 import com.steerinfo.ems.trmworkproc.model.TRmWorkproc;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -34,4 +35,6 @@ public interface TRmWorkprocMapper extends IBaseMapper<TRmWorkproc, String> {
      */
 	List<TRmWorkproc> queryPlanMoth();
 
+    List<TRmWorkproc> getDataForPk(HashMap<String, Object> params);
+
 }

src/main/java/com/steerinfo/ems/trmworkproc/mapper/TRmWorkprocMapper.xml

@@ -558,4 +558,12 @@
       (select workprocid from EMS_PRODPLAN_MONTH where 1=1)
       ORDER BY NAME
   </select>
+  <select id="getDataForPk" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    SELECT ID,NAME,NODE FROM T_RM_WORKPROC
+    <where>
+      <if test="workprocid != null and  workprocid != ''">
+        and ID in  (${workprocid})
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/steerinfo/ems/trmworkproc/service/ITRmWorkprocService.java

@@ -4,6 +4,7 @@ import com.steerinfo.ems.trmworkproc.mapper.TRmWorkprocMapper;
 import com.steerinfo.ems.trmworkproc.model.TRmWorkproc;
 import com.steerinfo.framework.service.IBaseService;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -29,4 +30,6 @@ public interface ITRmWorkprocService extends IBaseService<TRmWorkproc, String>{
     List<TRmWorkprocMapper> getIdAndName(Map<String, Object> parameters);
 
     Integer getMaxSeqNo();
+
+    List<TRmWorkproc> getDataForPk(HashMap<String, Object> params);
 }

src/main/java/com/steerinfo/ems/trmworkproc/service/impl/TRmWorkprocServiceImpl.java

@@ -7,7 +7,9 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import sun.security.krb5.internal.PAData;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -55,4 +57,9 @@ public class TRmWorkprocServiceImpl extends BaseServiceImpl<TRmWorkproc, String>
         return tRmWorkprocMapper.getMaxSeqNo();
     }
 
+    @Override
+    public List<TRmWorkproc> getDataForPk(HashMap<String, Object> params) {
+        return tRmWorkprocMapper.getDataForPk(params);
+    }
+
 }

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/controller/TRmWorkprocMaterialValueController.java

@@ -4,6 +4,7 @@ import com.steerinfo.ems.formula.service.IFormulaService;
 import com.steerinfo.ems.ifmesemsswapfile.service.IIfMesEmsSwapfileService;
 import com.steerinfo.ems.trmworkprocmaterial.mapper.TRmWorkprocMaterialMapper;
 import com.steerinfo.ems.trmworkprocmaterial.model.TRmWorkprocMaterial;
+import com.steerinfo.ems.trmworkprocmaterialvalue.mapper.TRmWorkprocMaterialValueMapper;
 import com.steerinfo.ems.trmworkprocmaterialvalue.model.TRmWorkprocMaterialValue;
 import com.steerinfo.ems.trmworkprocmaterialvalue.service.ITRmWorkprocMaterialValueService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
@@ -42,7 +43,9 @@ public class TRmWorkprocMaterialValueController extends BaseRESTfulController {
     
     @Autowired
     private TRmWorkprocMaterialMapper tRmWorkprocMaterialMapper;
-    
+
+    @Autowired
+    private TRmWorkprocMaterialValueMapper tRmWorkprocMaterialValueMapper;
     @Autowired
     IIfMesEmsSwapfileService ifMesEmsSwapfileService;
     
@@ -270,4 +273,37 @@ public class TRmWorkprocMaterialValueController extends BaseRESTfulController {
     	}
     	return success();
     }
+    @ApiOperation(value="盘库消耗查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("trmworkprocmaterialvalue:view")
+    @GetMapping(value = "/getpkdata")
+    public RESTfulResult list(@RequestParam HashMap parmas){
+        if(parmas.get("clock") == null || parmas.get("clock").equals("")){
+            return failed(null,"请选择月份");
+        }
+        PageList<TRmWorkprocMaterialValue> list = tRmWorkprocMaterialValueService.getpkdata(parmas);
+        return success(list);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据主键(itemid, clock, timegranid)来指定更新对象，并根据传过来的tRmWorkprocMaterialValue信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tRmWorkprocMaterialValue", value = "详细实体tRmWorkprocMaterialValue", required = true, dataType = "TRmWorkprocMaterialValue")
+    })
+    @PutMapping(value = "/updatexh", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult updatexh(@RequestBody TRmWorkprocMaterialValue[] models){
+        HashMap<String, Object> m = new HashMap<String, Object>();
+        for (TRmWorkprocMaterialValue model : models) {
+            m.put("clock", model.getClock());
+            m.put("timegranid", model.getTimegranid());
+            m.put("itemid", model.getItemid());
+            model.setId(m);
+            TRmWorkprocMaterialValue tRmWorkprocMaterialValue = tRmWorkprocMaterialValueService.getById(m);
+            tRmWorkprocMaterialValue.setJtz(model.getJtz());
+            tRmWorkprocMaterialValueMapper.updateByPrimaryKeySelective(tRmWorkprocMaterialValue);
+        }
+        return  success();
+    }
 }

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/mapper/TRmWorkprocMaterialValueMapper.java

@@ -71,4 +71,9 @@ public interface TRmWorkprocMaterialValueMapper extends IBaseMapper<TRmWorkprocM
      * @return
      */
     List<TRmWorkprocMaterialValue> getReportValue(HashMap<String, Object> params);
+
+    /**
+     * 盘库消耗查询
+     */
+    List<Map<String,Object>> getpkdata(Map<String,Object> params);
 }

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/mapper/TRmWorkprocMaterialValueMapper.xml

@@ -18,6 +18,8 @@
     <result column="UPMAN" jdbcType="VARCHAR" property="upman" />
     <result column="UPDATETIME" jdbcType="VARCHAR" property="updatetime" />
     <result column="USERID" jdbcType="VARCHAR" property="userid" />
+    <result column="JTZ" jdbcType="DECIMAL" property="jtz"/>
+    <result column="PKL" jdbcType="DECIMAL" property="pkl"/>
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="map">
     delete from T_RM_WORKPROC_MATERIAL_VALUE
@@ -269,6 +271,9 @@
       <if test="sumucvalue != null">
         SUMUCVALUE = #{sumucvalue,jdbcType=DECIMAL},
       </if>
+      <if test="jtz != null">
+        JTZ = #{jtz,jdbcType=DECIMAL},
+      </if>
       <if test="bz != null">
         BZ = #{bz,jdbcType=VARCHAR},
       </if>
@@ -619,4 +624,48 @@
       AND DATES &lt;= TO_DATE(#{clock1}, 'yyyy-MM-dd')
     </if>
   </select>
+  <select id="getpkdata" parameterType="java.util.HashMap" resultType="Map">
+            SELECT *
+            FROM (SELECT T.TIMEGRANID,
+            T.SUMVALUE,
+            T.BZ,
+            T.ISLOCK,
+            T.LOCKID,
+            T.CLOCK,
+            T.ITEMID,
+            T.ACTUALVALUE,
+            T.CORRECTVALUE,
+            T.APPORTVALUE,
+            T.JTZ,
+            T.UCVALUE,
+            T.SUMUCVALUE,
+            T1.WORKPROCID,
+            T1.MATERIALID,
+            T1.SEQNO,
+            T1.USEFLAG,
+            T1.PRIORITY,
+            T1.UNITID,
+            T1.ITEMTYPE,
+            T2.NAME         AS MATERIALNAME,
+            T3.NAME         AS WORKPROCNAME
+            FROM t_rm_workproc_material_value T
+            LEFT JOIN T_RM_WORKPROC_MATERIAL T1
+            ON T.ITEMID = T1.ITEMID
+            LEFT JOIN T_RM_MATERIAL T2
+            ON T1.MATERIALID = T2.ID
+            LEFT JOIN T_RM_WORKPROC T3
+            ON T1.WORKPROCID = T3.ID
+            WHERE T.TIMEGRANID = 'DAY') T
+            <where>
+              <if test="clock != null and clock != ''">
+               AND to_char(to_date(T.CLOCK, 'yyyy-mm-dd'),'yyyy-mm') = #{clock}
+              </if>
+              <if test="workprocid != null and workprocid != ''">
+                AND T.WORKPROCID =#{workprocid}
+              </if>
+              <if test="materialid != null and materialid != ''">
+                AND T.MATERIALID =#{materialid}
+              </if>
+            </where>
+  </select>
 </mapper>

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/model/TRmWorkprocMaterialValue.java

@@ -132,6 +132,17 @@ public class TRmWorkprocMaterialValue implements IBasePO<HashMap<String, Object>
     @ApiModelProperty(value="创建时间",required=true)
     private String updatetime;
 
+    @ApiModelProperty(value = "均摊值",required = true)
+    private BigDecimal jtz;
+
+    public BigDecimal getJtz() {
+        return jtz;
+    }
+
+    public void setJtz(BigDecimal jtz) {
+        this.jtz = jtz;
+    }
+
     private static final long serialVersionUID = 1L;
 
     public String getClock() {

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/service/ITRmWorkprocMaterialValueService.java

@@ -112,4 +112,10 @@ public interface ITRmWorkprocMaterialValueService extends IBaseService<TRmWorkpr
 	 * @return
 	 */
 	void getReportValue(Date date);
+
+	/**
+	 * 盘库消耗查询
+	 */
+	PageList<Map<String, Object>> getpkdata(Map<String, Object> parameters);
+
 }

src/main/java/com/steerinfo/ems/trmworkprocmaterialvalue/service/impl/TRmWorkprocMaterialValueServiceImpl.java

@@ -1083,5 +1083,12 @@ public class TRmWorkprocMaterialValueServiceImpl extends BaseServiceImpl<TRmWork
 		}
 	}
 
+	@Override
+	public PageList<Map<String, Object>> getpkdata(Map<String, Object> parameters) {
+		List<Map<String, Object>> rows = tRmWorkprocMaterialValueMapper.getpkdata(parameters);
+		PageList<Map<String, Object>> pageInfo = new PageList<Map<String, Object>>(rows);
+		return pageInfo;
+	}
+
 
 }

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/controller/TRmWorkprocProductValueController.java

@@ -4,9 +4,11 @@ import com.steerinfo.auth.utils.JwtUtil;
 import com.steerinfo.ems.Utils.DateUtils;
 import com.steerinfo.ems.formula.service.IFormulaService;
 import com.steerinfo.ems.ifmesemsswapfile.service.IIfMesEmsSwapfileService;
+import com.steerinfo.ems.trmworkprocmaterialvalue.model.TRmWorkprocMaterialValue;
 import com.steerinfo.ems.trmworkprocproduct.mapper.TRmWorkprocProductMapper;
 import com.steerinfo.ems.trmworkprocproduct.model.TRmWorkprocProduct;
 import com.steerinfo.ems.trmworkprocproduct.service.ITRmWorkprocProductService;
+import com.steerinfo.ems.trmworkprocproductvalue.mapper.TRmWorkprocProductValueMapper;
 import com.steerinfo.ems.trmworkprocproductvalue.model.TRmWorkprocProductValue;
 import com.steerinfo.ems.trmworkprocproductvalue.service.ITRmWorkprocProductValueService;
 import com.steerinfo.framework.controller.BaseRESTfulController;
@@ -50,6 +52,9 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
     
     @Autowired
     private TRmWorkprocProductMapper tRmWorkprocProductMapper;
+
+    @Autowired
+    private TRmWorkprocProductValueMapper tRmWorkprocProductValueMapper;
     
     @Autowired
     IFormulaService formulaService;
@@ -456,4 +461,38 @@ public class TRmWorkprocProductValueController extends BaseRESTfulController {
     	}
     	return success();
     }
+    @ApiOperation(value="盘库产出查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("trmworkprocmaterialvalue:view")
+    @GetMapping(value = "/getpkdata")
+    public RESTfulResult list(@RequestParam HashMap parmas){
+        if(parmas.get("clock") == null || parmas.get("clock").equals("")){
+            return failed(null,"请选择月份");
+        }
+        PageList<TRmWorkprocProductValue> list = tRmWorkprocProductValueService.getpkdata(parmas);
+        return success(list);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据主键(itemid, clock, timegranid)来指定更新对象，并根据传过来的tRmWorkprocMaterialValue信息来更新详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tRmWorkprocMaterialValue", value = "详细实体tRmWorkprocMaterialValue", required = true, dataType = "TRmWorkprocMaterialValue")
+    })
+    @PutMapping(value = "/updatecc", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult updatech(@RequestBody TRmWorkprocProductValue[] models){
+        HashMap<String, Object> m = new HashMap<String, Object>();
+        for (TRmWorkprocProductValue model : models) {
+            m.put("clock", model.getClock());
+            m.put("timegranid", model.getTimegranid());
+            m.put("itemid", model.getItemid());
+            m.put("itemtype", "R");
+            model.setId(m);
+            TRmWorkprocProductValue tRmWorkprocProductValue = tRmWorkprocProductValueService.getById(m);
+            tRmWorkprocProductValue.setJtz(model.getJtz());
+            tRmWorkprocProductValueMapper.updateByPrimaryKeySelective(tRmWorkprocProductValue);
+        }
+        return  success();
+    }
 }

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/mapper/TRmWorkprocProductValueMapper.java

@@ -134,4 +134,9 @@ public interface TRmWorkprocProductValueMapper extends IBaseMapper<TRmWorkprocPr
 	 */
 	List<TRmWorkprocProductValue> getReportValue(HashMap<String, Object> params);
 
+	/**
+	 * 盘库消耗查询
+	 */
+	List<Map<String,Object>> getpkdata(Map<String,Object> params);
+
 }

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/mapper/TRmWorkprocProductValueMapper.xml

@@ -21,6 +21,7 @@
     <result column="QRMAN" jdbcType="VARCHAR" property="qrman" />
     <result column="QRTIME" jdbcType="VARCHAR" property="qrtime" />
     <result column="RTPVALUE" jdbcType="DECIMAL" property="rtpvalue" />
+    <result column="JTZ" jdbcType="DECIMAL" property="jtz"/>
   </resultMap>
   <delete id="deleteByPrimaryKey" parameterType="map">
     delete from T_RM_WORKPROC_PRODUCT_VALUE
@@ -261,6 +262,9 @@
       <if test="actualvalue != null">
         ACTUALVALUE = #{actualvalue,jdbcType=DECIMAL},
       </if>
+      <if test="jtz != null ">
+        JTZ = #{jtz,jdbcType=DECIMAL},
+      </if>
       <if test="correctvalue != null">
         CORRECTVALUE = #{correctvalue,jdbcType=DECIMAL},
       </if>
@@ -800,4 +804,48 @@ FROM
       AND DATES &lt;= TO_DATE(#{clock1}, 'yyyy-MM-dd')
     </if>
   </select>
+
+  <!--盘库查询-->
+  <select id="getpkdata" parameterType="java.util.HashMap" resultType="Map">
+      SELECT *
+      FROM (SELECT
+      T.TIMEGRANID,
+      T.SUMVALUE,
+      T.BZ,
+      T.ISLOCK,
+      T.LOCKID,
+      T.CLOCK,
+      T.ITEMID,
+      T.ACTUALVALUE,
+      T.CORRECTVALUE,
+      T.APPORTVALUE,
+      T.JTZ,
+      T1.WORKPROCID,
+      T1.PRODUCTID,
+      T1.SEQNO,
+      T1.USEFLAG,
+      T1.UNITID,
+      T1.ITEMTYPE,
+      T2.NAME     AS PRODUCTNAME,
+      T3.NAME     AS WORKPROCNAME
+      FROM T_RM_WORKPROC_PRODUCT_VALUE T
+      LEFT JOIN T_RM_WORKPROC_PRODUCT T1
+      ON T.ITEMID = T1.ITEMID
+      LEFT JOIN T_RM_PRODUCT T2
+      ON T1.PRODUCTID = T2.ID
+      LEFT JOIN T_RM_WORKPROC T3
+      ON T1.WORKPROCID = T3.ID
+      WHERE T.TIMEGRANID = 'DAY') T
+    <where>
+      <if test="clock != null and clock != ''">
+        and substr(t.CLOCK, 0, 7) = #{clock}
+      </if>
+      <if test="workprocid != null and workprocid != ''">
+        AND T.WORKPROCID =#{workprocid}
+      </if>
+      <if test="productid != null and productid != ''">
+        AND T.PRODUCTID =#{productid}
+      </if>
+    </where>
+  </select>
 </mapper>

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/model/TRmWorkprocProductValue.java

@@ -2,6 +2,8 @@ package com.steerinfo.ems.trmworkprocproductvalue.model;
 
 import com.steerinfo.framework.model.IBasePO;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.beans.factory.annotation.Autowired;
+
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.HashMap;
@@ -113,7 +115,19 @@ public class TRmWorkprocProductValue implements IBasePO<HashMap<String, Object>>
      */
     @ApiModelProperty(value = "上报产量", required = true)
     private BigDecimal rtpvalue;
+    /**
+     * 盘库值
+     */
+    @ApiModelProperty(value = "均摊值", required = true)
+    private BigDecimal jtz;
 
+    public BigDecimal getJtz() {
+        return jtz;
+    }
+
+    public void setJtz(BigDecimal jtz) {
+        this.jtz = jtz;
+    }
     private static final long serialVersionUID = 1L;
 
     public String getItemid() {

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/service/ITRmWorkprocProductValueService.java

@@ -156,4 +156,9 @@ public interface ITRmWorkprocProductValueService extends IBaseService<TRmWorkpro
      * @return
      */
     void getReportValue(Date date);
+
+    /**
+     * 盘库消耗查询
+     */
+    PageList<Map<String, Object>> getpkdata(Map<String, Object> parameters);
 }

src/main/java/com/steerinfo/ems/trmworkprocproductvalue/service/impl/TRmWorkprocProductValueServiceImpl.java

@@ -1180,4 +1180,11 @@ public class TRmWorkprocProductValueServiceImpl extends BaseServiceImpl<TRmWorkp
 			tRmWorkprocProductValueMapper.updateByPrimaryKeySelective(tRmWorkprocProductValue);
 		}
 	}
+
+	@Override
+	public PageList<Map<String, Object>> getpkdata(Map<String, Object> parameters) {
+		List<Map<String, Object>> rows = tRmWorkprocProductValueMapper.getpkdata(parameters);
+		PageList<Map<String, Object>> pageInfo = new PageList<Map<String, Object>>(rows);
+		return pageInfo;
+	}
 }