1

pom.xml

@@ -263,7 +263,7 @@
 	       </exclusions>  
 	       <scope>compile</scope>  
 	     </dependency>
-		
+
 	</dependencies>
 
 	<!-- 导入Spring Cloud的依赖管理 -->

src/main/java/com/chinaitop/depot/act/controller/ActRoleController.java

@@ -8,6 +8,7 @@ import com.chinaitop.depot.business.service.RoleInfoService;
 import org.activiti.engine.delegate.Expression;
 import org.activiti.engine.impl.task.TaskDefinition;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -26,7 +27,7 @@ public class ActRoleController {
 	 * @throws Exception
 	 * @param procInstId 流程定义的id
 	 */
-	@RequestMapping(value="/getUserList")
+	@RequestMapping(value="/getUserList", method=RequestMethod.GET)
 	public Map<String, Object> getUserList(String procInstId, String type,Integer orgId) throws Exception{
 		/*procInstId = "190075";*/
 		int roleId = 0 ;
@@ -69,10 +70,12 @@ public class ActRoleController {
 				modelMap.put("userByRoleId", userByRoleId);
 			}else {
 				modelMap.put("isEnd", true);
+				modelMap.put("msg", "没有下一个审批角色或没有角色对应的审批人");
 			}
 
 		}else {
 			modelMap.put("isEnd", true);
+			modelMap.put("msg", "没有检测到流程数据信息");
 
 		}
 		return modelMap;

src/main/java/com/chinaitop/depot/business/controller/BusinessStoreWareDetailController.java

@@ -444,7 +444,7 @@ public class BusinessStoreWareDetailController {
     @RequestMapping(value="/getCkRemainNumber",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
     @ApiOperation(value="剩余数量(出库通知单)", notes = "剩余数量(出库通知单)")
     @ApiImplicitParams({
-    	@ApiImplicitParam(name = "receiveNoticeList", value = "选中的数据", paramType = "query")
+    	@ApiImplicitParam(name = "receiveNoticeListJson", value = "选中的数据", paramType = "query")
     })
     public Map<String, Object> getCkRemainNumber(String receiveNoticeListJson) {
     	Map<String, Object> modelMap = new HashMap<String, Object>();

src/main/java/com/chinaitop/depot/business/mapper/BusinessStoreWareDetailMapper.xml

@@ -620,16 +620,15 @@
   </select>
   <!-- 通过合同ID获取合同子表数据的已使用数量 -->
   <select id="selectContractUseCount" parameterType="java.util.Map" resultType="java.util.Map">
-    SELECT detail.contract_id, detail.id, detail.house_id,detail.warehouse_id, SUM(detail.in_count) in_count, SUM(detail.out_count) out_count FROM 
+    SELECT detail.contract_id, detail.house_id,detail.warehouse_id, SUM(detail.in_count) in_count, SUM(detail.out_count) out_count FROM 
 	(
-	SELECT c.id contract_id,a.id, a.house_id,a.warehouse_id,a.in_count,a.out_count FROM business_store_ware_detail a
+	SELECT c.id contract_id, a.house_id,a.warehouse_id,a.in_count,a.out_count FROM business_store_ware_detail a
 	LEFT JOIN business_delivery_storage_notice b on b.id=a.zid
 	LEFT JOIN business_contract c ON c.id=b.contract_bid
 	WHERE 1=1 AND a.type='notice' AND b.audit_state!=4 AND b.changing=0
 	) detail
 	WHERE detail.contract_id=#{contract_id} 
 	GROUP BY detail.contract_id,detail.house_id,detail.warehouse_id
-	ORDER BY detail.id
   </select>
   
   <!-- 储备粮中计算合同中已使用的数量 -->

src/main/java/com/chinaitop/depot/business/service/impl/BusinessContractReceiveServiceImpl.java

@@ -116,10 +116,17 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		}
 		String pz = obj.getString("pz");
 		if (StringUtils.isNotBlank(pz)) {
-			Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(1061, null, pz);
-			logger.info("根据"+pz+"获取到的品种数据如下：");
-			logger.info(basicMap.toString());
-			String lypz = basicMap.get("enumId")+"";
+			String lypz = "";
+			if (pz.equals("2130000") || pz.equals("1410000")) {
+				lypz = "7144";
+				logger.info("根据"+pz+"获取到的品种数据如下：");
+				logger.info("原油对应的字典ID是：7144");
+			} else {
+				Map<String, Object> basicMap = feignBasicService.getIdByNameAndParentId(1061, null, pz);
+				lypz = basicMap.get("enumId")+"";
+				logger.info("根据"+pz+"获取到的品种数据如下：");
+				logger.info(basicMap.toString());
+			}
 			if (StringUtils.isNotBlank(lypz)) {
 				dataobj.setLypz(Integer.parseInt(lypz));
 			} else {
@@ -131,7 +138,12 @@ public class BusinessContractReceiveServiceImpl implements BusinessContractRecei
 		String mxpz = obj.getString("mxpz");
 		if (StringUtils.isNotBlank(mxpz)) {
 			if (null != dataobj.getLypz()) {
-				Integer enumid = getEnumId(dataobj.getLypz(), mxpz);
+				Integer enumid = null;
+				if (mxpz.equals("2131000")) {
+					enumid = 7145;
+				} else {
+					enumid = getEnumId(dataobj.getLypz(), mxpz);
+				}
 				logger.info("根据"+mxpz+"获取到的明细品种数据是："+enumid);
 				if (null != enumid) {
 					dataobj.setMxpz(enumid);

src/main/java/com/chinaitop/depot/business/service/impl/ReceiveNoticeServiceImpl.java

@@ -242,7 +242,9 @@ public class ReceiveNoticeServiceImpl implements ReceiveNoticeService {
                             Integer wareHouseId = (Integer) wareDataMap.get("wareHouseId");
                             Integer orgId = (Integer) wareDataMap.get("orgId");
                             businessNoticeReceive.setHouseId(houseId); //仓房
-                            businessNoticeReceive.setWareHouseId(wareHouseId); //货位
+                            if (!wareHouseId.toString().equals(houseId.toString())) {//只有粮仓才保存货位，油罐不保存货位
+                            	businessNoticeReceive.setWareHouseId(wareHouseId); //货位
+                            }
                             businessNoticeReceive.setOrgId(orgId);  //组织id
                             if(ObjectUtils.toString(jsonObject.getString("ywlx")).equals("6")){//入库竞价的业务类型
                                 if(jsonObject.getString("pz")!=null){