接口修改

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageMapper.java

@@ -37,7 +37,7 @@ public interface CrudeOilStorageMapper extends BaseMapper<CrudeOilStorage> {
             "\tsum(c.weight) as weight,\n" +
             "\to.sid as typeSid,\n" +
             "\tp.weight as pWeight,\n" +
-            "\tp.price as price\n" +
+            "\tp.price as price\n," +
             "\tp.typeSid as typeSid\n" +
             "FROM\n" +
             "\tcrude_oil_storage c\n" +
@@ -45,7 +45,7 @@ public interface CrudeOilStorageMapper extends BaseMapper<CrudeOilStorage> {
             "\tLEFT JOIN tank_information t ON t.sid = c.tankSid\n" +
             "\tLEFT JOIN crude_oil_type_information o ON o.sid = t.crudeSid\n" +
             "\twhere c.procSid =#{procSid}\n" +
-            "\tGROUP BY c.tankSid")
+            "\tGROUP BY p.typeSid")
     List<CrudeOilStorageVo> getCrudeByProcSid(@Param("procSid")String procSid);
     @Select("SELECT\n" +
             "\tc.sid as typeSid\n" +

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/crudeoilstorage/CrudeOilStorageService.java

@@ -67,6 +67,8 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
         ResultBean rb=new ResultBean();
         Date curDate = new Date();
         String dfmt = DateUtil.format(curDate, "yyyy-MM-dd");
+        //没有订单编号也能录入
+        if(null!=dto.getProcSid()){
             SysUser sysUser=sysUserMapper.selectOne(new QueryWrapper<SysUser>().eq("id", StpUtil.getLoginIdAsString()));
             //入库记录
             List<CrudeOilStorageVo> list=baseMapper.getCrudeByProcSid(dto.getProcSid());
@@ -78,7 +80,7 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
             }
             for(CrudeOilStorageVo vo:list){
                 if(v.getTypeSid().equals(vo.getTypeSid())){
-                if((vo.getWeight()+dto.getWeight())>vo.getPWeight()){
+                    if( (vo.getWeight()+dto.getWeight())>vo.getPWeight()){
                         return rb.setMsg("输入的价值大于采购订单的价值,请验证是否正确");
                     }else if((vo.getWeight()+dto.getWeight())==vo.getPWeight()){
                         //入库价值和采购价值相比  相同修改订单状态
@@ -98,7 +100,7 @@ public class CrudeOilStorageService extends MybatisBaseService<CrudeOilStorageMa
                     }
                 }
             }
-        CrudeOilStorageVo vo=baseMapper.getCreateByProcSid(dto.getProcSid());
+        }
         CrudeOilStorage entity=new CrudeOilStorage();
         BeanUtil.copyProperties(dto, entity, "id", "sid");
         String [] file=dto.getCrudeOilStorageFile();

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsMapper.java

@@ -49,9 +49,9 @@ public interface ProcurementDetailsMapper extends BaseMapper<ProcurementDetails>
             "\t\tWHEN 5 THEN\n" +
             "\t\t'财务审批' \n" +
             "\t\tWHEN 6 THEN\n" +
-            "\t\t'待入库' \n" +
+            "\t\t'在途' \n" +
             "\t\tWHEN 7 THEN\n" +
-            "\t\t'已完成' \n" +
+            "\t\t'已入库' \n" +
             "\tEND AS stateValue ,count(1) as amount,\n" +
             "\tsum(d.price * d.weight) as totalValue\n" +
             "FROM\n" +
@@ -65,4 +65,6 @@ public interface ProcurementDetailsMapper extends BaseMapper<ProcurementDetails>
     ProcurementDetailsVo getProBySid(@Param("sid")String sid);
     @Select("select * from crude_oil_type_information where sid=#{sid}")
     CrudeOilTypeInformationVo getCrudeBySid(@Param("sid")String sid);
+    @Select("select * from procurement_details where state=#{state} group by sid")
+    List<ProcurementDetailsVo> getProByState(@Param("state")String state);
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsMapper.xml

@@ -14,8 +14,8 @@
             when 3 then '监管审批'
             when 4 then '银行审批'
             when 5 then '财务审批'
-            when 6 then '待入库'
+            when 6 then '在途'
-            when 7 then '已完成'
+            when 7 then '已入库'
             end as stateValue,count(1) as amount,
             sum(d.price * d.weight) as totalValue
         </if>

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsRest.java

@@ -77,4 +77,15 @@ public class ProcurementDetailsRest {
     public ResultBean delete(@PathVariable String sid ){
         return RawProcurementDetailsService.del(sid);
     }
+
+    /**
+     * 查询在途订单
+     * @param state
+     * @return
+     */
+    @ApiOperation("查询在途订单")
+    @GetMapping("/getProcByState/{sid}")
+    public ResultBean getProcByState(@PathVariable String state){
+        return RawProcurementDetailsService.getProcByState(state);
+    }
 }

yxt-supervise-cyf/yxt-supervise-cyf-biz/src/main/java/com/yxt/supervise/cyf/biz/procurementdetails/ProcurementDetailsService.java

@@ -13,6 +13,7 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecord;
 import com.yxt.supervise.cyf.api.approvalrecord.ApprovalRecordDto;
+import com.yxt.supervise.cyf.api.crudeoilstorage.CrudeOilStorage;
 import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformation;
 import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationDto;
 import com.yxt.supervise.cyf.api.crudeoiltypeinformation.CrudeOilTypeInformationVo;
@@ -26,6 +27,7 @@ import com.yxt.supervise.cyf.api.procurementdetails.ProcurementDetailsVo;
 import com.yxt.supervise.cyf.api.sysuser.SysUser;
 import com.yxt.supervise.cyf.biz.approvalrecord.ApprovalRecordMapper;
 import com.yxt.supervise.cyf.biz.approvalrecord.ApprovalRecordService;
+import com.yxt.supervise.cyf.biz.crudeoilstorage.CrudeOilStorageMapper;
 import com.yxt.supervise.cyf.biz.crudeoiltypeinformation.CrudeOilTypeInformationMapper;
 import com.yxt.supervise.cyf.biz.crudeoiltypeinformation.CrudeOilTypeInformationService;
 import com.yxt.supervise.cyf.biz.materialinventory.MaterialInventoryMapper;
@@ -46,7 +48,7 @@ import java.util.List;
 public class ProcurementDetailsService extends MybatisBaseService<ProcurementDetailsMapper, ProcurementDetails> {
 
     @Autowired
-    MaterialInventoryMapper rawMaterialInventoryMapper;
+    CrudeOilStorageMapper crudeOilStorageMapper;
     @Autowired
     ApprovalRecordService approvalRecordService;
     @Autowired
@@ -244,4 +246,23 @@ public class ProcurementDetailsService extends MybatisBaseService<ProcurementDet
         baseMapper.delete(new QueryWrapper<ProcurementDetails>().eq("sid",sid));
         return rb.success().setMsg("删除成功");
     }
+    public ResultBean getProcByState(String state){
+        ResultBean rb=new ResultBean();
+        List<ProcurementDetailsVo>list=baseMapper.getProByState(state);
+        for(ProcurementDetailsVo procurementDetailsVo:list){
+            List<ProcurementDetails>details=baseMapper.selectList(new QueryWrapper<ProcurementDetails>().eq("sid",procurementDetailsVo.getSid()));
+            double i=0;
+            for(ProcurementDetails procurementDetails:details){
+                i=i+(procurementDetails.getWeight()*procurementDetails.getPrice());
+            }
+            procurementDetailsVo.setTotalValue(i);
+            list.add(procurementDetailsVo);
+            //入库数量
+
+        }
+
+
+        return rb.success().setData(list);
+    }
+
 }