Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/mapper/MakeMapper.java

@@ -25,9 +25,8 @@ public interface MakeMapper extends CommonBaseMapper<Make> {
 
     int validateCodeWhenUpdate(@Param("code") String code, @Param("id") Long id, @Param("companyId") Long company);
 
-    double getOnHand(@Param("prodcode") String prodcode, @Param("whcode") String whcode, @Param("companyId") Long companyId);
+    Double getOnHand(@Param("prodcode") String prodcode, @Param("whcode") String whcode, @Param("companyId") Long companyId);
 
     String selectMakeInOutCode(@Param("code") String code, @Param("companyId") Long companyId, @Param("type") String type);
 
-    void calcMakePriceAndTotal(Long id);
 }

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/mapper/MakeMaterialMapper.java

@@ -25,4 +25,6 @@ public interface MakeMaterialMapper {
     void batchInsert(List<MakeMaterial> vendorcontactList);
 
     void batchUpdate(List<MakeMaterial> vendorcontactList);
+
+    void calcdetailtotal(Long ma_id);
 }

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/MakeServiceImpl.java

@@ -105,11 +105,6 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             docBaseDTO = generateMsgObj(make.getId(), make.getMa_code());
             messageLogService.save(docBaseDTO);
 
-
-            //抓取出库单位成本，计算出库成本
-            calcMakePriceAndTotal(make.getId());
-
-
         }else{
             //更新主表
             make.setUpdaterId(BaseContextHolder.getUserId());
@@ -147,17 +142,10 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             docBaseDTO = generateMsgObj(make.getId(), make.getMa_code());
             messageLogService.update(docBaseDTO);
 
-            //抓取出库单位成本，计算出库成本
-            calcMakePriceAndTotal(make.getId());
-
         }
         return docBaseDTO;
     }
 
-    private void calcMakePriceAndTotal(Long id) {
-        getMapper().calcMakePriceAndTotal(id);
-    }
-
 
     /**
      * 校验库存是否足够
@@ -171,8 +159,11 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             int i = 0;
             for(MakeMaterial makeMaterial : makeMaterialList){
                 i++;
-                double qty = makeMaterial.getMm_qty();
-                double onHand = getMapper().getOnHand(makeMaterial.getMm_prodcode(),makeMaterial.getMm_whcode(), BaseContextHolder.getCompanyId());
+                double qty = makeMaterial.getMm_qty()==null?0:makeMaterial.getMm_qty();
+                Double onHand = getMapper().getOnHand(makeMaterial.getMm_prodcode(),makeMaterial.getMm_whcode(), BaseContextHolder.getCompanyId());
+                if (onHand==null){
+                    onHand=0d;
+                }
                 if(onHand < qty){
                     throw new BizException(79402, "行" + i + "库存不足");
                 }
@@ -265,22 +256,21 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             DocBaseDTO docBaseDTO = saveOrUpdate(makeListDTO);
             make.setId(docBaseDTO.getId());
         }
-        //抓取出库单位成本，计算出库成本
-        calcMakePriceAndTotal(make.getId());
-
         //2.校验库存是否足够
         validStorage(makeListDTO);
         //3.生成  完工入库单和领料单 并 过账
         generateProdIO(makeListDTO);
+
         //4.修改单据状态
         Make updateMake = new Make();
+        updateMake.setId(make.getId());
         updateMake.setMa_status(Status.AUDITED.getDisplay());
         updateMake.setMa_statuscode(Status.AUDITED.name());
         updateMake.setUpdateTime(new Date());
         updateMake.setUpdaterId(BaseContextHolder.getUserId());
         updateMake.setMa_auditman("");
         updateMake.setMa_auditdate(new Date());
-        getMapper().updateByPrimaryKeySelective(make);
+        getMapper().updateByPrimaryKeySelective(updateMake);
         DocBaseDTO docBaseDTO = generateMsgObj(make.getId(), make.getMa_code());
         //5.记录LOG
         messageLogService.audit(docBaseDTO);
@@ -292,9 +282,12 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
      * 2.过账
      * @param makeListDTO
      */
+    @Transactional(rollbackFor = Exception.class)
     private void generateProdIO(MakeListDTO makeListDTO) {
         Make make = makeListDTO.getMain();
+        Long ma_id = make.getId();
         List<MakeMaterial> items = makeListDTO.getItems();
+
         if ("组装".equals(make.getMa_type())){
             /** 1.生产领料单 **/
             //a.主表
@@ -303,7 +296,6 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             String code = maxnumberService.getMaxnumber("MakeOut", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
-            //prodInOut.setPi_total(make.getMa_price());
             prodInOut.setPi_recordmanid(BaseContextHolder.getUserId());     //录入人ID
             prodInOut.setPi_recorddate(new Date());     //录入日期
             prodInOut.setPi_auditdate(new Date());      //审核日期
@@ -353,6 +345,10 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             if (!StringUtils.isEmpty(map.get("result"))){
                 throw new BizException(76201, map.get("result").toString());
             }
+
+            //重新获取更新后的工单
+            make = getMapper().selectByPrimaryKey(ma_id);
+
             /** 2.完工入库单 **/
             //a.主表
             prodInOut = new ProdInOut();
@@ -360,7 +356,6 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             code = maxnumberService.getMaxnumber("MakeIn", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
-            //prodInOut.setPi_total(make.getMa_price());
             prodInOut.setPi_recordmanid(BaseContextHolder.getUserId());     //录入人ID
             prodInOut.setPi_recorddate(new Date());     //录入日期
             prodInOut.setPi_auditdate(new Date());      //审核日期
@@ -371,6 +366,7 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
             prodInOut.setCreateTime(new Date());
             prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
+            prodInOut.setPi_total(make.getMa_total());
             prodInOutMapper.insertSelective(prodInOut);
             pi_id = prodInOut.getId();
             //b.从表
@@ -403,10 +399,10 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
                 throw new BizException(76201, map.get("result").toString());
             }
         }else if ("拆件".equals(make.getMa_type())){
-            /** 1.生产领料单 **/
+            /** 1.拆件领料单 **/
             //a.主表
             ProdInOut prodInOut = new ProdInOut();
-            prodInOut.setPi_class("生产领料单");
+            prodInOut.setPi_class("拆件领料单");
             String code = maxnumberService.getMaxnumber("MakeOut", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
@@ -434,8 +430,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodIODetail.setPd_prodid(make.getMa_prodid());    //物料ID
             prodIODetail.setPd_prodcode(make.getMa_prodcode()); //物料CODE
             prodIODetail.setPd_outqty(make.getMa_qty());        //出库数
-            prodIODetail.setPd_price(make.getMa_price());       //成本单价 ???
-            prodIODetail.setPd_total(make.getMa_total());      //金额
+            prodIODetail.setPd_price(new Double(0));       //成本单价 ???
+            prodIODetail.setPd_total(new Double(0));      //金额
             prodIODetail.setPd_whid(make.getMa_whid());         //仓库ID
             prodIODetail.setPd_whcode(make.getMa_whcode());     //仓库CODE
             prodIODetail.setPd_whname(make.getMa_whname());     //仓库名称
@@ -446,7 +442,7 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             //c.领料单过账
             Map<String, Object> map = new HashMap<String, Object>();
             map.put("inoutNo", code);
-            map.put("class", "生产领料单");
+            map.put("class", "拆件领料单");
             map.put("commitid", BaseContextHolder.getUserId());
             map.put("companyId", BaseContextHolder.getCompanyId());
             map.put("result", null);
@@ -454,6 +450,14 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             if (!StringUtils.isEmpty(map.get("result"))){
                 throw new BizException(76201, map.get("result").toString());
             }
+
+            //重新获取更新后的工单
+            //合计工单明细
+            makeMaterialMapper.calcdetailtotal(ma_id);
+            make = getMapper().selectByPrimaryKey(ma_id);
+            items = makeMaterialMapper.selectByFK(ma_id,BaseContextHolder.getCompanyId());
+
+
             /** 2.完工入库单 **/
             //a.主表
             prodInOut = new ProdInOut();
@@ -461,7 +465,6 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             code = maxnumberService.getMaxnumber("MakeIn", true).getData();
             prodInOut.setPi_inoutno(code);
             prodInOut.setPi_date(new Date());       //出入库日期
-            //prodInOut.setPi_total(make.getMa_price());
             prodInOut.setPi_recordmanid(BaseContextHolder.getUserId());     //录入人ID
             prodInOut.setPi_recorddate(new Date());     //录入日期
             prodInOut.setPi_auditdate(new Date());      //审核日期
@@ -474,6 +477,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
             prodInOutMapper.insertSelective(prodInOut);
             pi_id = prodInOut.getId();
+            //计算完工入库单主表金额
+            prodIODetailMapper.calcProdIn(pi_id);
             //b.从表
             List<ProdIODetail> prodIODetailList = new ArrayList<ProdIODetail>();
             int detno = 0;
@@ -526,11 +531,12 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         selectProdIO(make);
         //5.修改单据状态
         Make updateMake = new Make();
-        make.setMa_status(Status.UNAUDITED.getDisplay());
-        make.setMa_statuscode(Status.UNAUDITED.name());
-        make.setUpdateTime(new Date());
-        make.setUpdaterId(BaseContextHolder.getUserId());
-        getMapper().updateByPrimaryKeySelective(make);
+        updateMake.setId(make.getId());
+        updateMake.setMa_status(Status.UNAUDITED.getDisplay());
+        updateMake.setMa_statuscode(Status.UNAUDITED.name());
+        updateMake.setUpdateTime(new Date());
+        updateMake.setUpdaterId(BaseContextHolder.getUserId());
+        getMapper().updateByPrimaryKeySelective(updateMake);
         DocBaseDTO docBaseDTO = generateMsgObj(id, make.getMa_code());
         //6.记录LOG
         messageLogService.unAudit(docBaseDTO);
@@ -580,11 +586,18 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
      * 2.反过账
      * @param make
      */
+    @Transactional(rollbackFor = Exception.class)
     private void selectProdIO(Make make) {
         String code = make.getMa_code();
+        String type = make.getMa_type();
+        String outCode="";
         Long companyId = BaseContextHolder.getCompanyId();
         String inCode = getMapper().selectMakeInOutCode(code, companyId, "完工入库单");
-        String outCode = getMapper().selectMakeInOutCode(code, companyId, "生产领料单");
+        if ("拆件".equals(type)){
+            outCode = getMapper().selectMakeInOutCode(code, companyId, "拆件领料单");
+        }else if ("组装".equals(type)){
+            outCode = getMapper().selectMakeInOutCode(code, companyId, "生产领料单");
+        }
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("inoutNo", inCode);
         map.put("class", "完工入库单");
@@ -599,15 +612,25 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         prodInOutMapper.deleteByInOutNo(inCode, "完工入库单", BaseContextHolder.getCompanyId());
         prodIODetailMapper.deleteByInOutNo(inCode, "完工入库单", BaseContextHolder.getCompanyId());
 
+        if ("拆件".equals(type)){
+            map.put("class", "拆件领料单");
+        }else if ("组装".equals(type)){
+            map.put("class", "生产领料单");
+        }
         map.put("inoutNo", outCode);
-        map.put("class", "生产领料单");
-        //生产领料单反过账
+        map.put("result", null);
+        //生产领料单/拆件领料反过账
         prodInOutMapper.unPost(map);
         if(!StringUtils.isEmpty(map.get("result"))){
             throw new BizException(76204, map.get("result").toString());
         }
-        prodInOutMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
-        prodIODetailMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
+        if ("拆件".equals(type)){
+            prodInOutMapper.deleteByInOutNo(outCode, "拆件领料单", BaseContextHolder.getCompanyId());
+            prodIODetailMapper.deleteByInOutNo(outCode, "拆件领料单", BaseContextHolder.getCompanyId());
+        }else if ("组装".equals(type)){
+            prodInOutMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
+            prodIODetailMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
+        }
     }
 
     /**

applications/storage/storage-server/src/main/resources/mapper/MakematerialMapper.xml

@@ -337,4 +337,9 @@
         where mm_id=#{item.id}
     </foreach>
   </update>
+
+  <update id="calcdetailtotal" parameterType="long" >
+    update MakeMaterial set mm_amount = mm_price*mm_qty where mm_maid = #{id}
+  </update>
+
 </mapper>

frontend/saas-portal-web/src/css/main.css

@@ -91,6 +91,7 @@ main > section {
     z-index: 5;
 }
 /* 登录弹窗 */
+
 .box,.box-zc{
     display:none;
     width: 378px;
@@ -113,22 +114,24 @@ main > section {
     /* margin-top: -20px; */
 }
 .tc-logoimg {
-    width: 64px;
-    height: 64px;
+    width: 123px;
+    height: 53px;
+    margin-top: 22px;
 }
 .tc-out {
     position: absolute;
     top: 24px;
     right: 24px;
+    cursor:pointer;
 }
-.tc-logo {
+/* .tc-logo {
     font-family: PingFangSC-Medium;
     font-size: 18px;
     color: #007FE6;
     letter-spacing: 0.34px;
     text-align: center;
-    /* margin-top: 94px; */
-}
+    margin-top: 38px;
+} */
 .tc-title {
     font-family: PingFangSC-Regular;
     font-size: 14px;
@@ -136,6 +139,21 @@ main > section {
     letter-spacing: 0.3px;
     text-align: center;
     margin-top: 10px;
+    line-height: 30px;
+}
+.tc-hrleft {
+    width: 60px;
+    display: inline-block;
+    margin-top: 0;
+    margin-bottom: 5px;
+    margin-right: 5px;
+}
+.tc-hrright {
+    width: 50px;
+    display: inline-block;
+    margin-top: 0;
+    margin-bottom: 5px;
+    margin-left: 5px;
 }
 .tc-phone {
     background: rgba(32,53,128,0.01);
@@ -164,7 +182,7 @@ main > section {
     background-image: linear-gradient(-90deg, #007EE5 0%, #05B3FF 100%, #5533FF 100%);
     border-radius: 3px;
     border: 0;
-    box-shadow: 0px 12px 12px -12px #007EE5;
+    box-shadow: 0px 16px 22px -12px #05B3FF;
     width: 100%;
     height: 40px;
     margin-bottom: 12px;
@@ -201,7 +219,7 @@ main > section {
     height: 38px;
 }
 .tc-shibiema {
-    width: 194px;
+    width: 204px;
     margin-left: -10px;
 }
 .tc-huoqu {
@@ -217,6 +235,7 @@ main > section {
     width: 90px;
     height: 40px;
     margin-left: 10px;
+    border: #0080E6 1px solid;
 }
 /* 11/12注册页面 ..........................................*/
 .login {
@@ -263,58 +282,40 @@ main > section {
 }
 /* 首页内容 ..........................................*/
 .my-text {
-    display: block;
     position: absolute;
-    top: 156px;
-    left: 245px;
-    z-index: 5;
+    top: 200px;
+    left: 136px;
+    /* z-index: 5; */
+    width: 468px;
+    height: 300px;
 }
-.my-min {
-    font-family: PingFangSC-Medium;
-    font-size: 30px;
-    color: #0080FF;
-    letter-spacing: 4.17px;
-    text-shadow: 0 2px 4px rgba(255,255,255,0.50);
+.sy-dianzi {
+    width: 100%;
+    height: 50px;
 }
-.my-mix {
-    font-family: PingFangSC-Medium;
-    font-size: 36px;
-    color: #0080FF;
-    letter-spacing: 4.17px;
-}
-.my-bgbulue {
-    width: 389px;
-    height: 168px;
-    opacity: 0.41;
-    background: #4E9BFF;
-    position: relative;
-    top: -27px;
-    left: -15px;
+.sy-mb {
+    margin-bottom: 25px;
 }
-.my-bgtext {
-    font-family: PingFangSC-Regular;
-    letter-spacing: 4.17px;
-    position: absolute;
-    top: 39px;
-    left: 28px;
+.sy-mb img{
+    width: 100px;
+    height: 36px;
 }
-.my-right {
-    margin-left: 20px;
+.sy-mbimg2 {
+    width: 150px !important;
 }
-.my-bgtext span {
-    font-size: 30px !important;
-    color: #444444;
+.sy-mb>img:nth-child(2) {
+    margin-left: 15px;
 }
 .my-tiyan {
-    background-image: linear-gradient(90deg, #94E3FF 0%, #49A1FE 31%, #3D97FD 100%, #9DD0FF 100%);
-    box-shadow: 1px 2px 2px 0 rgba(79,92,125,0.50);
-    border-radius: 12px;
-    width: 210px;
-    height: 77px;
+    background: #5172DD;
+    box-shadow: 0 0 19px 0 rgba(137,143,164,0.63);
+    border-radius: 4px;
+    width: 100px;
+    height: 36px;
     font-family: PingFangSC-Regular;
-    font-size: 30px;
+    font-size: 16px;
     color: #FFFFFF;
-    letter-spacing: 4.17px;
+    border: 0;
 }
 .chrw {
     width: 486px;
@@ -323,7 +324,7 @@ main > section {
 .sy-img {
     position: absolute;
     top: 100px;
-    right: 100px;
+    right: 130px;
 }
 /* 特色 .......................................*/
 .ts-box {
@@ -798,13 +799,13 @@ h1.navbar-brand {
     padding: 0;
 }
 .mask-overly {
-    background: rgba(0, 0, 0, 0.2) none repeat scroll 0 0;
+    /* background: rgba(0, 0, 0, 0.2) none repeat scroll 0 0; */
     bottom: 0;
     left: 0;
     position: absolute;
     right: 0;
     top: 0;
-    z-index: 9;
+    /* z-index: 9; */
 
 }
 #slider #nav-arrows > a {

frontend/saas-portal-web/src/index.html

@@ -71,7 +71,7 @@
 					<h1 class="navbar-brand">
 						<a href="#body">
 							<img src="./img/assets/logo.png" alt="">
-							<span>优企云服</span>
+							<span>企云服</span>
 						</a>
 					</h1>
 					<!-- /logo -->
@@ -107,9 +107,9 @@
 			<div id="box-zc" class="box-zc">
 				<div class="tc-login" id="zhuce">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/叉号.png" alt=""></div>
-					<div><img class="tc-logoimg" src="./img/assets/logo-蓝.png" alt=""></div>
-					<div class="tc-logo">优企云服</div>
-					<div class="tc-title">注册</div>
+					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
+					<!-- <div class="tc-logo"><img class="tc-logoimg" src="./img/assets/logo-蓝@3x.png" alt="">企云服</div> -->
+					<div class="tc-title"><hr class="tc-hrleft"/>注册<hr class="tc-hrright"/></div>
 					<form action="#" method="post">
 						<div class="tc-phone">
 							<div class="tc-phonebox">
@@ -123,7 +123,7 @@
 									<input type="text" class="tc-yanzhengma tc-shibiema" name="" id="">
 								</div>
 							</div>
-							<div class="left"><img class="tc-yanzhengimg" src="./img/assets/Group.png" alt=""></div>
+							<div class="left"><img class="tc-yanzhengimg" src="./img/assets/timg (1).jpg" alt=""></div>
 							<div class="right" style="line-height: 40px;"><img src="./img/assets/刷新.png" alt=""></div>
 						</div>
 						<div style="width: 100%;">
@@ -136,7 +136,7 @@
 							<button class="tc-huoqu right">获取验证码</button>
 						</div>
 						<div class="xieyi">
-							<input class="checked" type="checkbox" checked> 
+							<input class="checked" type="checkbox" checked name="xieyi"/> 
 							<span>
 								我已阅读并同意
 								<a href="https://sso.ubtob.com/common/agreement">《优软云服务条款》</a>
@@ -156,9 +156,9 @@
 		<!-- 账号登录 -->
 				<div class="tc-login" id="zhanghao">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/叉号.png" alt=""></div>
-					<!-- <div></div> -->
-					<div class="tc-logo"><img class="tc-logoimg" src="./img/assets/logo-蓝.png" alt="">企云服</div>
-					<div class="tc-title">账号登陆</div>
+					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
+					<!-- <div class="tc-logo"><img class="tc-logoimg" src="./img/assets/logo-蓝@3x.png" alt="">企云服</div> -->
+					<div class="tc-title"><hr class="tc-hrleft"/>账号登录<hr class="tc-hrright"/></div>
 					<form action="#" method="post">
 						<div class="tc-phone">
 							<div class="tc-phonebox">
@@ -199,9 +199,9 @@
 
 				<div class="tc-login" id="duanxin" style="display:none">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/叉号.png" alt=""></div>
-					<div><img class="tc-logoimg" src="./img/assets/logo-蓝.png" alt=""></div>
-					<div class="tc-logo">优企云服</div>
-					<div class="tc-title">短信登陆</div>
+					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
+					<!-- <div class="tc-logo"><img class="tc-logoimg" src="./img/assets/logo-蓝@3x.png" alt="">企云服</div> -->
+					<div class="tc-title"><hr class="tc-hrleft"/>短信登录<hr class="tc-hrright"/></div>
 					<form action="#" method="post">
 						<div class="tc-phone">
 							<div class="tc-phonebox">
@@ -250,24 +250,25 @@
 				
 					<div class="sl-slide" data-orientation="horizontal" data-slice1-rotation="-25" data-slice2-rotation="-25" data-slice1-scale="2" data-slice2-scale="2">
 						<div class="mask-overly"></div>
-						<div class="bg-img slider-1"></div>
+						<div class="bg-img slider-1">
+							<!-- <img src="./img/assets/背景.png" alt=""> -->
+						</div>
 						<!-- 首页内容 -->
 						<div class="my-text">
-							<!-- <h4 class="my-min">简单易用 轻松上手</h4>
-							<h3 class="my-mix">电子行业云端企业管理解决方案</h3>
-							<div class="my-bgbulue">
-								<div class="my-bgtext">
-									<p style="margin-bottom: 20px">
-										<span>寻源管理</span>
-										<span class="my-right">进销存管理</span>
-									</p>
-									<p>
-										<span>任务管理</span>
-										<span class="my-right">资金管理</span>
-									</p>
-								</div>
+							<img class="sy-dianzi sy-mb" src="./img/assets/电子行业字段.png" alt="">
+							<div class="sy-mb">
+								<img src="./img/assets/寻.png" alt="">
+								<img class='sy-mbimg2' src="./img/assets/进.png" alt="">
+							</div>
+							<div class="sy-mb">
+								<img src="./img/assets/任.png" alt="">
+								<img src="./img/assets/资.png" alt="">
+							</div>
+							<div class="sy-mb">
+								<img src="./img/assets/Group.png" alt="">
+								<img src="./img/assets/轻.png" alt="">
 							</div>
-							<button class='my-tiyan'>立即体验</button> -->
+							<button class='my-tiyan'>立即体验</button> 
 						</div>
 						<div class="sy-img"><img class="chrw" src="./img/assets/插画人物.png" alt=""></div>
 						<div class="slide-caption">

frontend/saas-web/app.json

@@ -291,9 +291,10 @@
         "cache": {
             "enable": true
         },
-        "compressor": {
+        /**"compressor": {
             "type": "yui"
-        },
+        },*/
+        "compressor":null,
         "server": {
             "basePath": "http://192.168.0.181:8560",
             "urlPattern": "^\/api\/"

frontend/saas-web/app/view/core/chart/ChartBase.js

@@ -1,6 +1,10 @@
 Ext.define('saas.view.core.chart.ChartBase', {
     extend: 'Ext.panel.Panel',
 
+    requires: [
+        'Ext.chart.*'
+    ],
+
     height: 300,
 
     layout: 'fit',

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -361,10 +361,11 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     beforeAudit:function(){
         var me = this,
         viewModel = me.getViewModel(),
-        store = viewModel.get('detail0').detailStore;
-        store.each(function(item){
-            if(item.data.pd_price==0){
-                showToast(item.data.pd_pdno+'行'+item.data.pd_prodcode+'物料单价为0');
+        grid = me.down('detailGridField'),
+        data = grid.getTrueData();
+        Ext.Array.each(data,function(item){
+            if(item.pd_price==0){
+                showToast(item.pd_pdno+'行'+item.pd_prodcode+'物料单价为0');
             }
         });
         return true;

frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -111,12 +111,14 @@ Ext.define('saas.view.stock.make.FormPanel', {
         name : "ma_price", 
         fieldLabel : "单位成本",
         readOnly:true,
+        editable:false,
         decimals:8,
         columnWidth: 0.25
     },{
         xtype : "numberfield", 
         name : "ma_total",
-        readOnly:true, 
+        readOnly:true,
+        editable:false, 
         fieldLabel : "总成本",
         decimals:2,
         columnWidth: 0.25